Merge upstream and update Gemfile.lock

This commit is contained in:
2020-01-26 02:32:26 -05:00
parent 12bc37ec52
commit d91d43fa01
47 changed files with 1648 additions and 194 deletions

View File

@@ -6,4 +6,4 @@ layout: base
<div role="main" class="container">
{{ content }}
</div>
</div>