Resolve conflicts (merge master)

This commit is contained in:
Samuel Shifterovich
2018-12-15 17:41:51 +01:00
14 changed files with 1311 additions and 1434 deletions

View File

@ -183,8 +183,7 @@
</nav>
<!-- navigation ends here -->
<div class="py-4">
<h1 id="top"></h1>
<div id="top" class="py-4">
<div class="mb-5"></div>
{{ content }}
</div>