From: Dessalines <tyhou13@gmx.com>
Date: Mon, 20 Jan 2020 16:10:00 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Url: http://these/git/ui/assets/static/git-logo.png?a=commitdiff_plain;h=7aa801b1117882a65caa79bfcd3396e06e376ec3;p=lemmy.git

Merge branch 'master' into dev
---

7aa801b1117882a65caa79bfcd3396e06e376ec3