Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Brandon Davis 2016-08-22 21:18:08 -07:00
commit f0c9f6a09d

View file

@ -21,7 +21,7 @@
</div> </div>
</div> </div>
{% block content %}{% endblock %} {% block content %}{% endblock %}
<script src="{{ config.STATIC_URL }}/jquery/jquery.min.js"></script> <script src="{{ config.STATIC_URL }}/jquery/jquery-1.8.2.min.js"></script>
<script src="{{ config.STATIC_URL }}/bootstrap/js/bootstrap.min.js"></script> <script src="{{ config.STATIC_URL }}/bootstrap/js/bootstrap.min.js"></script>
{% block js %}{% endblock %} {% block js %}{% endblock %}
</body> </body>