Commit 7371ee67 authored by Administrator's avatar Administrator

Merge branch 'unstable' into testing

parents 6040d5f2 eec56527
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% block css %} {% block css %}
{% load staticfiles %} {% load staticfiles %}
<link rel="stylesheet" href="/css/bootstrap.css"> <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
<script src="{% static "js/jquery/jquery.min.js" %}" type="text/javascript"></script> <script src="{% static "js/jquery/jquery.min.js" %}" type="text/javascript"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment