Skip to content

Commit

Permalink
Merge eec398c into 4dedf75
Browse files Browse the repository at this point in the history
  • Loading branch information
jeriox committed Jan 11, 2021
2 parents 4dedf75 + eec398c commit 64662fc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 0 additions & 1 deletion ephios/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"bootstrap4",
"guardian",
"django_select2",
"jquery",
"djangoformsetjs",
"compressor",
"recurrence",
Expand Down
2 changes: 2 additions & 0 deletions ephios/static/jquery/js/jquery-3.5.1.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ephios/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{% block css %}{% endblock %}
{% endcompress %}
{% compress js %}
<script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
<script type="text/javascript" src="{% static "jquery/js/jquery-3.5.1.min.js" %}"></script>
<script type="text/javascript" src="{% static "bootstrap/js/bootstrap.bundle.min.js" %}"></script>
<script type="text/javascript" src="{% static "select2/js/select2.js" %}"></script>
<script type="text/javascript" src="{% static "django_select2/django_select2.js" %}"></script>
Expand Down

0 comments on commit 64662fc

Please sign in to comment.