Merge remote-tracking branch 'origin/develop' into develop

2015-09-20 20:20:26 +02:00 · 2015-09-20 20:20:26 +02:00 · a4095f42e2
parent aa7905d6a0 1d11dfabaa
commit a4095f42e2
2 changed files with 3 additions and 0 deletions
--- a/digitalglarus/static/digitalglarus/img/favicon.ico
+++ b/digitalglarus/static/digitalglarus/img/favicon.ico
--- a/digitalglarus/templates/digitalglarus/base.html
+++ b/digitalglarus/templates/digitalglarus/base.html
@ -13,6 +13,9 @@

    <title>Digital Glarus - {% block title %}Welcome{% endblock %}</title>

+    <!-- Favicon -->
+    <link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}"/>
+
    <!-- Bootstrap Core CSS -->
    <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">