taler-www

commit bf1f34aa0fd53d79ace6a1d82b2b2d5087994537
parent aec227ff7f0f9178c7f2c995d1d86aeb6e2f991b
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed, 29 Mar 2017 00:32:52 +0200

Merge branch 'master' into stable

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

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