aboutsummaryrefslogtreecommitdiff
path: root/rel
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-06-27 04:19:44 +0000
committerkaniini <nenolod@gmail.com>2019-06-27 04:19:44 +0000
commit6587e2358c4746d760b212a25f6cd8b751158045 (patch)
tree720c05e354aa1dcc1295400d8665bb1d9b13b675 /rel
parentcfb5be3cedcd0e486851ebaf2b3abb4b838fc909 (diff)
parentc6705144a2758c76943ad7967da412572efcbc2d (diff)
downloadpleroma-6587e2358c4746d760b212a25f6cd8b751158045.tar.gz
Merge branch 'fix/admin-configure' into 'develop'
don't delete config settings on admin update See merge request pleroma/pleroma!1340
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions