madmaurice d942b1393b Merge branch 'master' into 'feature-multilingual' ... # Conflicts: # _includes/menu.html		2018-01-01 01:29:35 +01:00
..
footer.html	Add license to footer	2017-12-22 07:02:28 +01:00
header.html	Use relative paths for relative_url filter	2017-12-21 22:17:07 +01:00
menu.html	Merge branch 'master' into 'feature-multilingual'	2018-01-01 01:29:35 +01:00