Merge upstream and update Gemfile.lock

This commit is contained in:
2020-01-26 01:25:25 -05:00
parent 12bc37ec52
commit cd64966896
44 changed files with 1624 additions and 183 deletions

View File

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