diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-04-14 21:08:51 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-04-14 21:08:51 +0200 |
| commit | 67ecbdc29b9ce1bc9a926b700d7d28ce4cef2b0a (patch) | |
| tree | b7055bfce362f2aaf75e1c9c02071dd4fb5edf7c | |
| parent | bf1f34aa0fd53d79ace6a1d82b2b2d5087994537 (diff) | |
| download | www-67ecbdc29b9ce1bc9a926b700d7d28ce4cef2b0a.tar.gz www-67ecbdc29b9ce1bc9a926b700d7d28ce4cef2b0a.tar.bz2 www-67ecbdc29b9ce1bc9a926b700d7d28ce4cef2b0a.zip | |
add EH talk
| -rw-r--r-- | news.html.j2.inc | 1 | ||||
| -rw-r--r-- | news/2017-04.inc | 5 | ||||
| m--------- | web-common | 0 |
3 files changed, 6 insertions, 0 deletions
diff --git a/news.html.j2.inc b/news.html.j2.inc index fa3cc7eb..7ada2150 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 00000000..9be89ece --- /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 Commons Attribution NoDerivatives 3.0 Unported License</a>. + </p> diff --git a/web-common b/web-common -Subproject caf5a98114402d057ba08b14279eb8e46481a02 +Subproject dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bf |