summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-03 11:02:59 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-03 11:02:59 +0200
commit41f1c4d8dfe913ecfaaf417f7a0d12535820fa92 (patch)
tree17260a27a34a05585ba1d124ed4a55dbaa080a4f
parentf0b281e06c464d049f0fe1b429474e86c3617e06 (diff)
parent484e65fb9c48b26b46f69b460db3d4b73825bffb (diff)
downloadwww-41f1c4d8dfe913ecfaaf417f7a0d12535820fa92.tar.gz
www-41f1c4d8dfe913ecfaaf417f7a0d12535820fa92.tar.bz2
www-41f1c4d8dfe913ecfaaf417f7a0d12535820fa92.zip
Merge branch 'master' into stable
-rw-r--r--news/2016-10.html.j22
-rw-r--r--news/2017-08.html.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/news/2016-10.html.j2 b/news/2016-10.html.j2
index 3f381df..5c7ce4f 100644
--- 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
index d1769d4..42167c4 100644
--- 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 %}