Merge branch 'admin-fixes' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)
Admin fixes

See merge request pleroma/pleroma!1524


Trivial merge