Merge remote-tracking branch 'origin/master'

b9849d34 · Julian · c667cd7e · d0aa7977 · b9849d34 · 60576ae5
Commit b9849d34 authored 5 years ago by Julian
--- a/aleksis/core/templates/core/base.html
+++ b/aleksis/core/templates/core/base.html
@@ -28,6 +28,8 @@

  {# Include jQuery to provide $(document).ready #}
  {% include_js "jQuery" %}
+
+  {% block extra_head %}{% endblock %}
 </head>
 <body>


--- a/AlekSIS-App-Chronos @ 60576ae5
+++ b/AlekSIS-App-Chronos @ 60576ae5
-Subproject commit e201434b5636c5c1beb7bdecf062215c9bc995e5
+Subproject commit 60576ae5c3f6aa15e63387afe6205aa889668bbb