From: Dessalines Date: Tue, 14 Apr 2020 19:45:49 +0000 (-0400) Subject: Merge branch 'admin_settings' into dev X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/%22https:/hacktivis.me/%7Bthis.captchaPngSrc%28%29%7D?a=commitdiff_plain;h=641e4c5d96d9d152bc75318b3ea08f789d920b2b;p=lemmy.git Merge branch 'admin_settings' into dev --- 641e4c5d96d9d152bc75318b3ea08f789d920b2b