Merge master into 5151/gdpr_modal

This commit is contained in:
PCoder 2018-08-22 23:25:11 +02:00
commit e230f2ac8c
14 changed files with 133 additions and 22 deletions

View file

@ -30,6 +30,14 @@
</span>
</a>
</li>
<li>
<a href="{% url 'djangocms_blog:posts-latest-feed' %}">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-rss fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
</ul>
<p class="copyright">
Copyright © ungleich GmbH {% now "Y" %}