diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-20 08:23:57 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-20 08:23:57 +0100 |
commit | 4c79fe781f42f66eebb84261f84869c4e488443a (patch) | |
tree | 6e584f021a516c36c4c5db9aba4f425d6ef22191 /news | |
parent | 760950212edb15bcac3bbf2553d377cfaed46378 (diff) | |
parent | c167a8ea2bbb86e945dee3e2ab6b4ba135049827 (diff) | |
download | www-4c79fe781f42f66eebb84261f84869c4e488443a.tar.gz www-4c79fe781f42f66eebb84261f84869c4e488443a.zip |
Merge branch 'master' into stable
Diffstat (limited to 'news')
-rw-r--r-- | news/2017-03.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/news/2017-03.inc b/news/2017-03.inc new file mode 100644 index 00000000..1e75caff --- /dev/null +++ b/news/2017-03.inc | |||
@@ -0,0 +1,8 @@ | |||
1 | <h3>03-2016: Sva explains GNU Taler at FOSSASIA in Singapore</h3> | ||
2 | <p> | ||
3 | <video id="video" poster="/videos/taler2017fossasia.png" autobuffer="" height="180" width="320" controls="controls"> | ||
4 | <source src="/videos/taler2017fossasia.webm" type="video/webm"> | ||
5 | <source src="/videos/taler2017fossasia.ogv" type="video/ogv"> | ||
6 | </video> | ||
7 | <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 Engineers.SG</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>. | ||
8 | </p> | ||