[GNUnet-SVN] [taler-www] 02/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 48116a7d50452c0f670dc2fffcfd97c57ecb62fd
Merge: 435718f 8b817fc
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Mar 1 09:29:54 2018 +0100

    Merge branch 'master' into stable

 .gitignore                         |    3 +-
 Makefile                           |    2 +
 common/navigation.j2.inc           |    6 +
 images/logo-2018.svg               |    8 +
 images/taler-tm.svg                |  326 ++++++
 images/taler-tshirt-blue-2018.svg  |  285 ++++++
 images/taler-tshirt-light-2018.svg |  276 ++++++
 locale/pt/LC_MESSAGES/messages.po  | 1928 ++++++++++++++++++++++++++++++++++++
 news/2017-10.inc                   |    4 +-
 template.py                        |    3 +-
 10 files changed, 2837 insertions(+), 4 deletions(-)

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