Merge upstream and update Gemfile.lock

This commit is contained in:
2020-01-26 01:40:06 -05:00
parent 12bc37ec52
commit 4b3f38dc61
47 changed files with 1648 additions and 194 deletions

View File

@@ -4,4 +4,4 @@
<link rel="stylesheet" href="{{ include.css.href }}" />
{% else %}
<link rel="stylesheet" href="{{ include.css }}" />
{% endif %}
{% endif %}