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

@@ -1,7 +1,7 @@
{% if include.css.sri %}
<link href="{{ include.css.href }}" rel="stylesheet" integrity="{{ include.css.sri }}" crossorigin="anonymous">
{% elsif include.css.href %}
<link rel="stylesheet" href="{{ include.css.href }}" />
<link rel="stylesheet" href="{{ include.css.href }}">
{% else %}
<link rel="stylesheet" href="{{ include.css }}" />
<link rel="stylesheet" href="{{ include.css }}">
{% endif %}