Merge branch 'staging' into excel_import

Conflicts: django/website/templates/base.html

Merge branch 'staging' into excel_import
2b6cdba2 · Martin Burchell · 279e0e51 · 3356713d · 279e0e51 · 2b6cdba2
Commit 2b6cdba2 authored 9 years ago by Martin Burchell
--- a/django/website/media/images/favicon.ico
+++ b/django/website/media/images/favicon.ico
--- a/django/website/templates/base.html
+++ b/django/website/templates/base.html
@@ -17,10 +17,11 @@
  <![endif]-->
  {% block bootstrap3_extra_head %}{% endblock %}
  <link href="{{ STATIC_URL }}css/styles.css" media="all" rel="stylesheet" />
+  <link rel="shortcut icon" href="{{STATIC_URL}}images/favicon.ico?v=1"/>
 </head>
 <body>
    {% block content %}
    <meta name="viewport" content="width=device-width,initial-scale=1">
    <div class="container-fluid">
@@ -51,7 +52,7 @@
        </div>
    </div>
    {% endblock content %}
    {% block bootstrap3_extra_js %}
 {% bootstrap_javascript jquery=True %}
    {% endblock %}