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)
commit6587e2358c4746d760b212a25f6cd8b751158045
tree720c05e354aa1dcc1295400d8665bb1d9b13b675
parentcfb5be3cedcd0e486851ebaf2b3abb4b838fc909
parentc6705144a2758c76943ad7967da412572efcbc2d
Merge branch 'fix/admin-configure' into 'develop'

don't delete config settings on admin update

See merge request pleroma/pleroma!1340