[GNUnet-SVN] [taler-www] 06/06: Merge branch 'master' into stable

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch stable
in repository www.

commit 76407671c72840744b4fc05d9068287567c22f58
Merge: a09a795 05941f3
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue May 15 21:40:21 2018 +0200

    Merge branch 'master' into stable

 news/2018-04.inc | 2 +-
 web-common       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden