www: master 08724a44

Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2019-08-13 23:13 master b7e7a95d
Changeset resolve conflict
mod - Dockerfile Diff File
mod - Makefile Diff File
mod - common/footer.j2.inc Diff File
mod - common/navigation.j2.inc Diff File
add - favicon.ico 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
add - news/2019-0.11.6.inc Diff File
add - news/2019-06-DSTJ.inc Diff File
add - news/2019-06.inc Diff File
add - news/2019-07-GHM_Aug_2019.inc Diff File
mod - rss.xml Diff File
add - static/images/NetBSD_Logo.svg Diff File
add - static/images/apple-logo.svg Diff File
add - static/images/archlinux-logo.svg Diff File
add - static/images/debian-logo.svg Diff File
add - static/images/gnunet-logo-dark-only-text.png Diff File
mod - static/images/gnunet-logo-dark-only-text.svg Diff File
add - static/images/gnunet-logo-dark-text-traditional.png Diff File
add - static/images/gnunet-logo-dark-text-traditional.svg Diff File
add - static/images/gnunet-logo-dark-text.png Diff File
add - static/images/gnunet-logo-dark-text.svg Diff File
add - static/images/netbsd-logo.png Diff File
add - static/images/ubuntu-logo32.png Diff File
add - static/moved_about.html Diff File
add - static/moved_gsoc.html Diff File
add - static/stage.robots.txt Diff File
mod - static/styles.sass Diff File
mod - static/team-images/ng0.jpg Diff File
add - static/team-images/no-foto.svg Diff File
add - static/team-images/xrs.jpg Diff File
mod - template/about.html.j2 Diff File
mod - template/architecture.html.j2 Diff File
mod - template/contact.html.j2 Diff File
mod - template/copyright.html.j2 Diff File
mod - template/engage.html.j2 Diff File
mod - template/ev.html.j2 Diff File
mod - template/glossary.html.j2 Diff File
mod - template/gnurl.html.j2 Diff File
mod - template/gsoc.html.j2 Diff File
mod - template/index.html.j2 Diff File
add - template/install-on-archpi.html.j2 Diff File
mod - template/install-on-debian9.html.j2 Diff File
mod - template/install-on-macos.html.j2 Diff File
mod - template/install-on-netbsd.html.j2 Diff File
mod - template/install-on-ubuntu1804.html.j2 Diff File
add - template/install.html.j2 Diff File
mod - template/news.html.j2.inc Diff File
mod - template/old-news.html.j2 Diff File
mod - template/team.html.j2 Diff File
rm - template/tutorial-archpi.html.j2 Diff File
mod - template/use.html.j2 Diff File
mod - template/video.html.j2 Diff File