[GNUnet-SVN] [taler-www] 01/06: fix #5263

[gnunet]

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

grothoff pushed a commit to branch stable
in repository www.

commit 435718fae8c74bdfcd23aea2e9f3e18c78ae9b8d
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jan 29 18:12:44 2018 +0100

    fix #5263
---
 citizens.html.j2  | 2 +-
 glossary.html.j2  | 2 +-
 merchants.html.j2 | 2 +-
 web-common        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/citizens.html.j2 b/citizens.html.j2
index 2d5b677..4b6a175 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -63,7 +63,7 @@
       <p>{{ _("Coins in your digital wallet will be of the same
                denomination as the cash in your physical wallet.
                Taler is not a crypto-currency, so you do not have
-               to worry about cryto-currency related value
+               to worry about crypto-currency related value
                fluctuations.  Banking with Taler is subject to the
                usual government protections for financial
                services.") }}</p>
diff --git a/glossary.html.j2 b/glossary.html.j2
index 03cb493..997f19b 100644
--- a/glossary.html.j2
+++ b/glossary.html.j2
@@ -54,7 +54,7 @@
 <dt>{{ _("exchange") }}</dt>
   <dd>
     {% trans %}
-     Taler's payment service provider.  Issues eletronic `coins` during 
`withdrawal` and redeems them when they are `deposited` by merchants.
+     Taler's payment service provider.  Issues electronic `coins` during 
`withdrawal` and redeems them when they are `deposited` by merchants.
     {% endtrans %}
   </dd>
 <dt>{{ _("extension") }}</dt>
diff --git a/merchants.html.j2 b/merchants.html.j2
index 970e562..687e516 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -92,7 +92,7 @@
          {% trans %}
                Taler can be used for different currencies (such as
                Euros, US Dollars or Bitcoins) and any amount, limited
-               only by applicable regulatation and what denominations
+               only by applicable regulation and what denominations
                the payment service provider supports.
          {% endtrans %}
       </p>
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