[www] 01/01: Merge branch 'master' into stable

[gnunet]

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

ng0 pushed a commit to branch stable
in repository www.

commit eda66aa43040d9196b61a1a7e0bad7e7c5dee693
Merge: 01815e9 076ecac
Author: ng0 <address@hidden>
AuthorDate: Mon Nov 11 21:19:00 2019 +0000

    Merge branch 'master' into stable

 .gitmodules                      |  2 ++
 build-system/taler-build-scripts |  2 +-
 configure                        |  3 ++-
 news/2019-11-ICANNUpdate.html.j2 |  5 ++++-
 template.py                      | 30 +++++++++++++++++++++++-------
 5 files changed, 32 insertions(+), 10 deletions(-)

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