Merge branch 'admin-changes' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)
Admin changes

See merge request pleroma/pleroma!1489


Trivial merge