From: Dessalines <tyhou13@gmx.com>
Date: Sun, 19 May 2019 18:05:44 +0000 (-0700)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/ui/assets/%7B%27/docs/static/git-logo.png?a=commitdiff_plain;h=b2997c8e7c1003b543c973e386eac403dd6ebbd9;p=lemmy.git

Merge branch 'dev'
---

b2997c8e7c1003b543c973e386eac403dd6ebbd9