www: master 83d6043b

Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2017-07-29 23:54 master bdc16723
Changeset resolving merge conflicts
mod - .gitignore Diff File
mod - Makefile Diff File
mod - common/navigation.j2.inc Diff File
mod - i18nfix.py Diff File
add - images/languageicon.svg Diff File
mod - locale/de/LC_MESSAGES/messages.po Diff File
mod - locale/en/LC_MESSAGES/messages.po Diff File
mod - locale/es/LC_MESSAGES/messages.po Diff File
mod - locale/fr/LC_MESSAGES/messages.po Diff File
mod - locale/it/LC_MESSAGES/messages.po Diff File
mod - press.html.j2 Diff File
mod - styles.css Diff File
mod - template.py Diff File