Commit Graph

153 Commits (ec7712952b23eba26ec031f99c0c44a3b9d02bb6)

Author SHA1 Message Date
Marc Horne 3c8cbb3235 Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle
# Conflicts:
#	static/css/custom.css
2017-06-20 18:49:47 +02:00
Jonas Oberg 552d583987 Changed the location of signatures file 2017-06-15 14:33:51 +02:00
Jonas Oberg efd76f6482 Updated locations to match image 2017-06-13 07:58:43 +02:00