diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-03-29 00:32:52 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-03-29 00:32:52 +0200 |
| commit | bf1f34aa0fd53d79ace6a1d82b2b2d5087994537 (patch) | |
| tree | f648810ca11ddc16680ddec2ca0a56fb6ce6e61a | |
| parent | aec227ff7f0f9178c7f2c995d1d86aeb6e2f991b (diff) | |
| parent | 11d4c78f65e6c2cd513789871b3be04f00945274 (diff) | |
| download | www-bf1f34aa0fd53d79ace6a1d82b2b2d5087994537.tar.gz www-bf1f34aa0fd53d79ace6a1d82b2b2d5087994537.zip | |
Merge branch 'master' into stable
| -rw-r--r-- | news/2017-02.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/news/2017-02.inc b/news/2017-02.inc index d776e360..85dfd0d8 100644 --- a/news/2017-02.inc +++ b/news/2017-02.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <h3>02-2016: Florian Dold explains Taler at 50p in Bangalore</h3> | 1 | <h3>02-2017: Florian Dold explains Taler at 50p in Bangalore</h3> |
| 2 | <p> | 2 | <p> |
| 3 | <video id="video" poster="/videos/dold50p.png" autobuffer="" height="180" width="320" controls="controls"> | 3 | <video id="video" poster="/videos/dold50p.png" autobuffer="" height="180" width="320" controls="controls"> |
| 4 | <source src="/videos/dold50p.webm" type="video/webm"> | 4 | <source src="/videos/dold50p.webm" type="video/webm"> |