From: Dessalines <tyhou13@gmx.com>
Date: Tue, 14 Apr 2020 19:45:49 +0000 (-0400)
Subject: Merge branch 'admin_settings' into dev
X-Git-Url: http://these/git/%7B%60https:/%7BrepoUrl%7D?a=commitdiff_plain;h=641e4c5d96d9d152bc75318b3ea08f789d920b2b;p=lemmy.git

Merge branch 'admin_settings' into dev
---

641e4c5d96d9d152bc75318b3ea08f789d920b2b