Merge branch 'admin-config' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 23 Jun 2019 05:42:37 +0000 (05:42 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 23 Jun 2019 05:42:37 +0000 (05:42 +0000)
Admin config

See merge request pleroma/pleroma!1328


Trivial merge