From: Dessalines <tyhou13@gmx.com>
Date: Mon, 29 Apr 2019 19:16:03 +0000 (-0700)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%24%7B%60data:application/static/git-logo.png?a=commitdiff_plain;h=da6871fd6d50000552214dcd13fc35e858a3c843;p=lemmy.git

Merge branch 'dev'
---

da6871fd6d50000552214dcd13fc35e858a3c843