[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] 01/01: Merge branch 'master' into stable
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-www] 01/01: Merge branch 'master' into stable |
|
Date: |
Mon, 20 Mar 2017 08:24:07 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch stable
in repository www.
commit 4c79fe781f42f66eebb84261f84869c4e488443a
Merge: 7609502 c167a8e
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Mar 20 08:23:57 2017 +0100
Merge branch 'master' into stable
Makefile | 2 +-
citizens.html.j2 | 72 +-
common/footer.j2.inc | 3 +-
developers.html.j2 | 161 +-
dist/css/bootstrap.css | 949 ++++++++----
dist/css/bootstrap.css.map | 2 +-
dist/css/bootstrap.min.css | 7 +-
dist/fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes
dist/fonts/glyphicons-halflings-regular.svg | 487 +++---
dist/fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes
dist/fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes
dist/js/bootstrap.js | 551 ++++---
dist/js/bootstrap.min.js | 10 +-
faq.html.j2 | 47 +-
governments.html.j2 | 211 +--
i18nfix.py | 20 +
index.html.j2 | 46 +-
investors.html.j2 | 6 +-
locale/babel.map | 4 +-
locale/de/LC_MESSAGES/messages.po | 2140 ++++++++++++++++++--------
locale/en/LC_MESSAGES/messages.po | 2130 +++++++++++++++++--------
locale/es/LC_MESSAGES/messages.po | 2138 +++++++++++++++++--------
locale/fr/LC_MESSAGES/messages.po | 2138 +++++++++++++++++--------
locale/it/LC_MESSAGES/messages.po | 2138 +++++++++++++++++--------
merchants.html.j2 | 130 +-
news.html.j2.inc | 1 +
news/2017-03.inc | 8 +
template.py | 3 +
28 files changed, 9199 insertions(+), 4205 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden