From: Dessalines <tyhou13@gmx.com>
Date: Mon, 29 Apr 2019 17:18:38 +0000 (-0700)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%22https:/nerdica.net/%7B%24%7B%60data:application/static/git-favicon.png?a=commitdiff_plain;h=fa453a5955550d6741cab8663ecb1b53a8d61de1;p=lemmy.git

Merge branch 'dev'
---

fa453a5955550d6741cab8663ecb1b53a8d61de1