From: Dessalines <tyhou13@gmx.com>
Date: Sun, 15 Mar 2020 17:05:50 +0000 (-0400)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%22%7Burl%7D/static/git-favicon.png?a=commitdiff_plain;h=ed0dd3b8c00d51989e8f652a3fa904c7b1eb7ec7;p=lemmy.git

Merge branch 'dev'
---

ed0dd3b8c00d51989e8f652a3fa904c7b1eb7ec7