[GNUnet-SVN] [taler-www] branch master updated: clearer answer

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new c59f9d3  clearer answer
c59f9d3 is described below

commit c59f9d3b6f4805eace9f2345a4f7f1d0e9344b96
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Jun 27 13:16:43 2019 +0200

    clearer answer
---
 faq.html.j2 | 8 +++++---
 web-common  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/faq.html.j2 b/faq.html.j2
index 0feabc8..f3657f7 100644
--- a/faq.html.j2
+++ b/faq.html.j2
@@ -4,9 +4,11 @@
 
 <h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2>
 {% trans %}
-<p>Taler does not use any Blockchain technology or Bitcoin directly.
-Taler is not based on proof-of-work or any other distributed consensus
-mechanism.  Instead Taler is based on blind signatures.</p>
+<p>Taler does not require any Blockchain technology, and is
+also not based on proof-of-work or any other distributed consensus
+mechanism.  Instead, Taler is based on blind signatures.
+However, it is theoretically possible to combine Taler with
+peer-to-peer crypto-currencies like Bitcoin.</p>
 {% endtrans %}
 {% trans %}
 <p>It would be possible, however, to withdraw coins denominated in
diff --git a/web-common b/web-common
index caf5a98..dc9d5ab 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c
+Subproject commit dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bfb

-- 
To stop receiving notification emails like this one, please contact
address@hidden.