From: Dessalines <tyhou13@gmx.com>
Date: Tue, 30 Apr 2019 04:10:01 +0000 (-0700)
Subject: Merge branch 'master' into dev
X-Git-Url: http://these/git/ui/assets/favicon.svg?a=commitdiff_plain;h=9dd8003cf0cf7458ebcd80b52ec2c9113bfe162f;p=lemmy.git

Merge branch 'master' into dev
---

9dd8003cf0cf7458ebcd80b52ec2c9113bfe162f