From: kaniini <nenolod@gmail.com>
Date: Thu, 27 Jun 2019 04:19:44 +0000 (+0000)
Subject: Merge branch 'fix/admin-configure' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=6587e2358c4746d760b212a25f6cd8b751158045;p=akkoma

Merge branch 'fix/admin-configure' into 'develop'

don't delete config settings on admin update

See merge request pleroma/pleroma!1340
---

6587e2358c4746d760b212a25f6cd8b751158045