From: Dessalines <tyhou13@gmx.com>
Date: Tue, 14 Jan 2020 22:14:06 +0000 (-0500)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%7B%60https:/%7Bthis.state.user.avatar%7D?a=commitdiff_plain;h=d02eb031bacdb1b43051b782464942ddc57f3f28;p=lemmy.git

Merge branch 'dev'
---

d02eb031bacdb1b43051b782464942ddc57f3f28