Silvio Giebl c7466e88a8 Merge branch 'improvement/navigation' into improvement/navigation-new ... # Conflicts: # _includes/nav.html # _layouts/default.html		2020-06-15 21:23:03 +02:00
..
css	Merge pull request #206 from iamcarrico/allow-for-overrides	2019-09-09 15:35:31 -04:00
images	Initial commit	2017-03-26 21:09:19 -04:00
js	Merge branch 'improvement/navigation' into improvement/navigation-new	2020-06-15 21:23:03 +02:00