[GNUnet-SVN] [taler-www] branch stable updated: add EH talk

[gnunet]

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

grothoff pushed a commit to branch stable
in repository www.

The following commit(s) were added to refs/heads/stable by this push:
     new 67ecbdc  add EH talk
67ecbdc is described below

commit 67ecbdc29b9ce1bc9a926b700d7d28ce4cef2b0a
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Apr 14 21:08:51 2017 +0200

    add EH talk
---
 news.html.j2.inc | 1 +
 news/2017-04.inc | 5 +++++
 web-common       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/news.html.j2.inc b/news.html.j2.inc
index fa3cc7e..7ada215 100644
--- a/news.html.j2.inc
+++ b/news.html.j2.inc
@@ -1,3 +1,4 @@
+{% include "news/2017-04.inc" %}
 {% include "news/2017-03.inc" %}
 {% include "news/2017-02.inc" %}
 {% include "news/2017-01.inc" %}
diff --git a/news/2017-04.inc b/news/2017-04.inc
new file mode 100644
index 0000000..9be89ec
--- /dev/null
+++ b/news/2017-04.inc
@@ -0,0 +1,5 @@
+          <h3>04-2017: Sva explains GNU Taler at EasterHegg and Torsten 
demonstrates it is child's play</h3>
+          <p>
+           <iframe width="320" height="180" 
src="https://media.ccc.de/v/EH2017-8471-taler_-_talk/oembed"; frameborder="0" 
allowfullscreen></iframe>
+          <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="/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">Sva, 
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 Commo 
[...]
+          </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