madmaurice c90f94f1e1 Merge branch 'master' into 'feature-rick-astley' ... # Conflicts: # _includes/header.html		2018-01-02 20:08:23 +01:00
..
footer.html	Add license to footer	2017-12-22 07:02:28 +01:00
header.html	Merge branch 'master' into 'feature-rick-astley'	2018-01-02 20:08:23 +01:00
menu.html	Merge branch 'master' into 'feature-multilingual'	2018-01-01 01:29:35 +01:00