From: Dessalines <tyhou13@gmx.com>
Date: Thu, 25 Jun 2020 20:16:16 +0000 (-0400)
Subject: Merge branch 'master' into improve-config
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/readmes/%7B%7D/%22%7Burl%7D/%24%7Bargs.thread.url%7D?a=commitdiff_plain;h=39285560330b5bb7b2588980c8163a2c1239585d;p=lemmy.git

Merge branch 'master' into improve-config
---

39285560330b5bb7b2588980c8163a2c1239585d