From: Dessalines <tyhou13@gmx.com>
Date: Mon, 18 May 2020 13:52:41 +0000 (-0400)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%7B%60/feeds/front/static/%7Bthis.props.site.site.icon%7D?a=commitdiff_plain;h=7bc9bc962a8006eb835daa387764594afafe6592;p=lemmy.git

Merge branch 'dev'
---

7bc9bc962a8006eb835daa387764594afafe6592