[GNUnet-SVN] [taler-www] 05/06: Merge branch 'stable' of git+ssh://taler.net/www 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 a09a795fb605fbfde941c1cb4d04f5f7d75358d0
Merge: 7587ee0 5a0f76e
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue May 15 21:40:17 2018 +0200

    Merge branch 'stable' of git+ssh://taler.net/www into stable

 about.html.j2                      |     4 -
 images/logo-2014-medium.png        |   Bin 123284 -> 0 bytes
 images/logo-2014.png               |   Bin 377176 -> 0 bytes
 images/logo-2015-medium.png        |   Bin 67263 -> 0 bytes
 images/logo-2015.png               |   Bin 247136 -> 0 bytes
 images/logo-2016-small.svg         |     4 -
 images/logo-2016.svg               |    37 -
 images/logo-2017.es.svg            |    40 +-
 images/logo-2017.fr.svg            |    42 +-
 images/logo-2017.svg               |    44 +-
 images/logo-2018-dold.raw.svg      |    10 +
 images/logo-2018-dold.svg          |    87 +
 images/logo-2018.svg               |     8 -
 images/taler-arch-full.es.svg      | 19594 -----------------------------------
 images/taler-arch-full.svg         |   286 +-
 images/taler-tm.svg                |   326 -
 images/taler-tshirt-blue-2018.svg  |   285 -
 images/taler-tshirt-light-2018.svg |   276 -
 index.html.j2                      |     2 +-
 locale/de/LC_MESSAGES/messages.po  |    88 +-
 locale/en/LC_MESSAGES/messages.po  |    59 +-
 locale/es/LC_MESSAGES/messages.po  |    90 +-
 locale/fr/LC_MESSAGES/messages.po  |    62 +-
 locale/it/LC_MESSAGES/messages.po  |    85 +-
 locale/pt/LC_MESSAGES/messages.po  |    66 +-
 locale/ru/LC_MESSAGES/messages.po  |    61 +-
 news.html.j2.inc                   |    11 +-
 news/2018-04.inc                   |    15 +
 old-news.html.j2                   |    14 +-
 press.html.j2                      |    10 +
 web-common                         |     2 +-
 31 files changed, 584 insertions(+), 21024 deletions(-)

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