Merge branch 'fix/admin-configure' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 27 Jun 2019 04:19:44 +0000 (04:19 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 27 Jun 2019 04:19:44 +0000 (04:19 +0000)
don't delete config settings on admin update

See merge request pleroma/pleroma!1340


Trivial merge