From: kaniini <ariadne@dereferenced.org>
Date: Sat, 3 Aug 2019 18:16:09 +0000 (+0000)
Subject: Merge branch 'admin-fixes' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4ae0a6652f2aaa04c8f96a7bfb4ffe35c8bfdeaf;p=akkoma

Merge branch 'admin-fixes' into 'develop'

Admin fixes

See merge request pleroma/pleroma!1524
---

4ae0a6652f2aaa04c8f96a7bfb4ffe35c8bfdeaf