Commit 701172bb authored by Mirko Vucicevich's avatar Mirko Vucicevich

Merge branch 'master' of

parents 1453a279 079ee464
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -36,10 +36,7 @@
<link rel="stylesheet" href="/static/css/font-awesome.min.css">
<link rel="stylesheet" href="/static/fontselect/fontselect.css">
<script src=""></script>
<link href="" rel="stylesheet">
<script src=""></script>
<script src="/static/js/jquery-2.1.4.min.js"></script>
<!-- Latest compiled and minified JavaScript -->
......@@ -194,10 +191,10 @@
<!-- All the javascripts -->
<script src=""></script>
<script src="/static/js/jquery-ui.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
<script src="/static/fontselect/jquery.fontselect.min.js"></script>
<script src=""></script>
<script src="/static/js/vue.js"></script>
<!-- development version, includes helpful console warnings -->
{% comment %} <script src=""></script> {% endcomment %}
<!-- Add Vue components before main.js (where Vue is instatiated) -->
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