Merge branch 'admin-configure' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)
committerkaniini <ariadne@dereferenced.org>
Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)
commit4d382d13478deafbbb9bff1ea5a60fc4a2316b11
tree527f386267d97ecda0c86f681a72b4c9e1bc4bcc
parente4e3fd7e5552db274655d58bbbec1e4faabf7ccd
parent846ad9a463e7d6767170305f32eef7bbd09f8a6b
Merge branch 'admin-configure' into 'develop'

admin api configure changes

See merge request pleroma/pleroma!1345