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
..
resources	Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle	2017-06-20 18:49:47 +02:00
share	…