From: kaniini <ariadne@dereferenced.org>
Date: Tue, 30 Jul 2019 16:36:05 +0000 (+0000)
Subject: Merge branch 'admin-changes' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=373a7c673983189539e39679cab50ae7869d2c4c;p=akkoma

Merge branch 'admin-changes' into 'develop'

Admin changes

See merge request pleroma/pleroma!1489
---

373a7c673983189539e39679cab50ae7869d2c4c