Merge branch 'upstream_master' into canonical

This commit is contained in:
saagit 2020-09-10 08:27:15 -07:00
commit 7425f44158
3 changed files with 3 additions and 3 deletions

View file

@ -18,7 +18,7 @@
{% endif %}
{% if USE_GOOGLE_FONTS != False %}
<link href="https://fonts.googleapis.com/css?family=Source+Code+Pro|Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,400;0,700;1,400&family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet">
{% endif %}
{% if USE_LESS %}

View file

@ -1,5 +1,5 @@
<p>
&copy; {{ COPYRIGHT_NAME }} {{ COPYRIGHT_YEAR }} - This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/{{ CC_LICENSE['slug'] }}/{{ CC_LICENSE['version'] }}/">{{ CC_LICENSE['name'] }} {{ CC_LICENSE['version'] }} International License</a>
&copy; {{ COPYRIGHT_YEAR }} {{ COPYRIGHT_NAME }} - This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/{{ CC_LICENSE['slug'] }}/{{ CC_LICENSE['version'] }}/">{{ CC_LICENSE['name'] }} {{ CC_LICENSE['version'] }} International License</a>
</p>
{% include "partial/flex.html" %}
<p>

View file

@ -1,4 +1,4 @@
<p>&copy; {{ COPYRIGHT_NAME }} {{ COPYRIGHT_YEAR }}</p>
<p>&copy; {{ COPYRIGHT_YEAR }} {{ COPYRIGHT_NAME }}</p>
{% include "partial/flex.html" %}
{% if STATUSCAKE %}
{% include "partial/statuscake.html" %}