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

@@ -13,6 +13,12 @@ layout: base
{% include disqus.html %}
</div>
{% include fb-comment.html %}
<div class="staticman-comments">
{% include staticman-comments.html %}
</div>
<div class="justcomments-comments">
{% include just_comments.html %}
</div>
{% endif %}
</div>
</div>