2 Commits (8dbc333b5cfb7c6a066d6a87b21278ff766535b9)

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	efd76f6482	Updated locations to match image	2017-06-13 07:58:43 +02:00