[GNUnet-SVN] [taler-www] branch master updated (0fb1d29 -> 3875acc)

[gnunet]

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

grothoff pushed a change to branch master
in repository www.

    from 0fb1d29  fix syntax errors
     add 7609502  sync version
     add 4c79fe7  Merge branch 'master' into stable
     add 0f62fd8  never have empty trans tags
     add aec227f  Merge branch 'master' into stable
     add bf1f34a  Merge branch 'master' into stable
     add 67ecbdc  add EH talk
     add 603e50d  move video to taler.net
     new 3875acc  Merge branch 'master' into stable

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 news.html.j2.inc | 1 +
 news/2017-04.inc | 9 +++++++++
 web-common       | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 news/2017-04.inc

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..a14fc8c
--- /dev/null
+++ b/news/2017-04.inc
@@ -0,0 +1,9 @@
+          <h3>04-2017: Sva explains GNU Taler at EasterHegg and Torsten 
demonstrates it is child's play</h3>
+          <p>
+           <video id="video" poster="/videos/taler2017eh.png" autobuffer="" 
height="180" width="320" controls="controls">
+           <source src="/videos/taler2017eh.webm" type="video/webm">
+           <source src="/videos/taler2017eh.ogv" type="video/ogv">
+           <source src="/videos/taler2017eh.mp4" type="video/mp4">
+           </video>
+          <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