taler-www

commit aec227ff7f0f9178c7f2c995d1d86aeb6e2f991b
parent 0f62fd8b102ce9ad1d457c234f37ed96e1a8de46
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 28 Mar 2017 23:15:47 +0200

Merge branch 'master' into stable

Diffstat:
M
news/2017-03.inc
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/news/2017-03.inc b/news/2017-03.inc
@@ -1,4 +1,4 @@
-          <h3>03-2016: Sva explains GNU Taler at FOSSASIA in Singapore</h3>
+          <h3>03-2017: Sva explains GNU Taler at FOSSASIA in Singapore</h3>
           <p>
            <video id="video" poster="/videos/taler2017fossasia.png" autobuffer="" height="180" width="320" controls="controls">
            <source src="/videos/taler2017fossasia.webm" type="video/webm">