From: kaniini <nenolod@gmail.com>
Date: Sun, 23 Jun 2019 05:42:37 +0000 (+0000)
Subject: Merge branch 'admin-config' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8b7860f12fd9cdf82332fdd8d9ce5696d5e13dd7;p=akkoma

Merge branch 'admin-config' into 'develop'

Admin config

See merge request pleroma/pleroma!1328
---

8b7860f12fd9cdf82332fdd8d9ce5696d5e13dd7