[GNUnet-SVN] [www] 03/03: Merge branch 'master' of ssh://git.gnunet.org/www

[gnunet]

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

xrs pushed a commit to branch master
in repository www.

commit 680deeb43b644b38684d5abf72c50820f0c2841c
Merge: 97cb360 38adf1f
Author: xrs <address@hidden>
AuthorDate: Mon Jul 8 18:05:43 2019 +0200

    Merge branch 'master' of ssh://git.gnunet.org/www

 Makefile                           |  1 +
 locale/de/LC_MESSAGES/messages.po  | 53 ++++++++++++++++++++++----------------
 locale/en/LC_MESSAGES/messages.po  | 49 ++++++++++++++++++++---------------
 locale/es/LC_MESSAGES/messages.po  | 53 ++++++++++++++++++++++----------------
 locale/fr/LC_MESSAGES/messages.po  | 51 ++++++++++++++++++++----------------
 locale/it/LC_MESSAGES/messages.po  | 51 ++++++++++++++++++++----------------
 static/stage.robots.txt            | 21 +++++++++++++++
 template/about.html.j2             | 22 ++++++++--------
 template/architecture.html.j2      |  8 +++---
 template/contact.html.j2           | 13 +++++++---
 template/install-on-macos.html.j2  |  2 +-
 template/install-on-netbsd.html.j2 |  2 +-
 template/use.html.j2               | 12 +++------
 13 files changed, 199 insertions(+), 139 deletions(-)


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