Merge branch 'master2' into improvement/navigation-merged

# Conflicts:
#	_layouts/default.html
This commit is contained in:
Silvio Giebl
2019-11-26 23:30:46 +01:00
23 changed files with 235 additions and 116 deletions

View File

@@ -1 +1,5 @@
{{ site.title }}
{% if site.logo %}
<div class="site-logo"></div>
{% else %}
{{ site.title }}
{% endif %}