From: Dessalines <tyhou13@gmx.com>
Date: Fri, 29 May 2020 17:03:44 +0000 (-0400)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%24%7B%60data:application/static/%24%7Bsite.site_view.site.icon?a=commitdiff_plain;h=0c2905fd2dfae48087b2f70d0d7c056ff2ffb737;p=lemmy.git

Merge branch 'dev'
---

0c2905fd2dfae48087b2f70d0d7c056ff2ffb737