Commit 5fba7921 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch 'master' of

parents e2e8ae48 61d8535a
......@@ -4,8 +4,9 @@
{% load staticfiles %}
<link href="/static/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="/static/css/style.css" rel="stylesheet" media="screen">
<script src="/static/js/jquery-1.10.2.min.js"></script>
<script src="/static/js/jquery-2.0.3.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
<link rel="icon" href="/static/img/favicon.ico">
<meta charset="utf-8">
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