diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-03-28 23:15:47 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-03-28 23:15:47 +0200 |
| commit | aec227ff7f0f9178c7f2c995d1d86aeb6e2f991b (patch) | |
| tree | 52d1a40367bf3c78c305e6d10cc5e90d7d6fa157 | |
| parent | 0f62fd8b102ce9ad1d457c234f37ed96e1a8de46 (diff) | |
| parent | 07ede6725d4e265a566e4019dc6fca861c514760 (diff) | |
| download | www-aec227ff7f0f9178c7f2c995d1d86aeb6e2f991b.tar.gz www-aec227ff7f0f9178c7f2c995d1d86aeb6e2f991b.zip | |
Merge branch 'master' into stable
| -rw-r--r-- | news/2017-03.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/news/2017-03.inc b/news/2017-03.inc index 1e75caff..9d575d09 100644 --- a/news/2017-03.inc +++ b/news/2017-03.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <h3>03-2016: Sva explains GNU Taler at FOSSASIA in Singapore</h3> | 1 | <h3>03-2017: Sva explains GNU Taler at FOSSASIA in Singapore</h3> |
| 2 | <p> | 2 | <p> |
| 3 | <video id="video" poster="/videos/taler2017fossasia.png" autobuffer="" height="180" width="320" controls="controls"> | 3 | <video id="video" poster="/videos/taler2017fossasia.png" autobuffer="" height="180" width="320" controls="controls"> |
| 4 | <source src="/videos/taler2017fossasia.webm" type="video/webm"> | 4 | <source src="/videos/taler2017fossasia.webm" type="video/webm"> |