Merge upstream

This commit is contained in:
2020-07-14 17:44:11 -04:00
parent 44353ad37a
commit 489b8963c7
145 changed files with 3145 additions and 21875 deletions

View File

@@ -9,9 +9,9 @@
<!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
{% if js contains 'jquery' %}
<script>
if (typeof jQuery == 'undefined') {
if (typeof jQuery == 'undefined') {
document.write('<script src="{{ js | relative_url }}"></scr' + 'ipt>');
}
}
</script>
{% else %}
<script src="{{ js | relative_url }}"></script>