gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: gnunet
Subject: [www] 01/01: Merge branch 'master' into stable
Date: Sun, 08 Dec 2019 12:11:07 +0100

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

ng0 pushed a commit to branch stable
in repository www.

commit 9975d6f250dee9a4d599d2c144b3700646290ca3
Merge: eda66aa 2b9a55a
Author: ng0 <address@hidden>
AuthorDate: Sun Dec 8 11:00:28 2019 +0000

    Merge branch 'master' into stable

 .gitignore                              |    9 +-
 .gitmodules                             |   10 +-
 .mailmap                                |    2 +
 FIXME                                   |    2 -
 GNUmakefile                             |   41 +-
 Makefile                                |   24 +-
 README                                  |    6 +-
 bootstrap                               |    5 +-
 build-system/taler-build-scripts        |    2 +-
 common/base.j2                          |    6 +-
 common/footer.j2.inc                    |    5 +
 common/header.j2.inc                    |    5 +
 common/navigation.j2.inc                |    2 +-
 common/news.j2                          |    7 +-
 configure                               |    1 -
 guix-env.scm                            |  128 --
 help                                    |    1 -
 i18nfix.py                              |   41 -
 inc                                     |    1 +
 inc/news.macro.j2                       |   13 -
 locale/de/LC_MESSAGES/messages.po       | 2075 +++----------------------------
 locale/en/LC_MESSAGES/messages.po       | 1927 ----------------------------
 locale/es/LC_MESSAGES/messages.po       | 1984 ++---------------------------
 locale/fr/LC_MESSAGES/messages.po       | 1928 ----------------------------
 locale/it/LC_MESSAGES/messages.po       | 1928 ----------------------------
 make_site.py                            |   76 ++
 make_sitemap.sh                         |   74 --
 news/2017-10.html.j2                    |    7 -
 news/2018-08.html.j2                    |   40 -
 news/index.html.j2                      |    2 +-
 rssg                                    |  220 ----
 favicon.ico => static/favicon.ico       |  Bin
 static/images/gns-logo.png              |  Bin 0 -> 36087 bytes
 static/images/gnunet-logo.svg           |  801 ++++++------
 static/pdf/flyer2017.pdf                |  Bin 941424 -> 0 bytes
 static/scroll.css                       |   49 +
 static/scroll.js                        |   12 +
 static/styles.css                       |  317 +++++
 static/styles.sass                      |  334 -----
 template.py                             |  304 -----
 template/engage.html.j2                 |   14 +-
 template/gns.html.j2                    |   63 +
 template/gsoc-2018-gnunet-webui.html.j2 |   74 +-
 template/index.html.j2                  |   59 +-
 template/install-on-netbsd.html.j2      |  262 ++--
 template/install.html.j2                |    8 +-
 template/use.html.j2                    |   14 +-
 template/video.html.j2                  |   12 +
 templates/feed-atom.py                  |    4 -
 templates/feed.atom.j2                  |   12 -
 templates/feed.xml                      |   15 -
 www.yml                                 |  113 +-
 52 files changed, 1519 insertions(+), 11520 deletions(-)

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]