From: kaniini <ariadne@dereferenced.org>
Date: Thu, 11 Jul 2019 13:02:13 +0000 (+0000)
Subject: Merge branch 'admin-configure' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4d382d13478deafbbb9bff1ea5a60fc4a2316b11;p=akkoma

Merge branch 'admin-configure' into 'develop'

admin api configure changes

See merge request pleroma/pleroma!1345
---

4d382d13478deafbbb9bff1ea5a60fc4a2316b11