taler-www

commit 41f1c4d8dfe913ecfaaf417f7a0d12535820fa92
parent f0b281e06c464d049f0fe1b429474e86c3617e06
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  3 Jul 2020 11:02:59 +0200

Merge branch 'master' into stable

Diffstat:
M
news/2016-10.html.j2
 | 
2
+-
M
news/2017-08.html.j2
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/news/2016-10.html.j2 b/news/2016-10.html.j2
@@ -4,6 +4,6 @@
 <p>
   We now have a first version of the Taler wallet for Firefox.
   For now, a development build of Firefox is required.
-  Installation instructions are on the <a href="/wallet">Wallet page</a>.
+  Installation instructions are on the <a href="https://wallet.taler.net/">Wallet page</a>.
 </p>
 {% endblock body_content %}
diff --git a/news/2017-08.html.j2 b/news/2017-08.html.j2
@@ -9,6 +9,6 @@
   </video>
 </p>
 <p>
-  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Jeff Burdges, Christian Grothoff and Sereni-T, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="https://taler.net/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Jeff Burdges, Christian Grothoff and Sereni-T, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
 </p>
 {% endblock body_content %}