From: feld <feld@feld.me>
Date: Thu, 6 Feb 2020 16:02:46 +0000 (+0000)
Subject: Merge branch 'config-changes' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5499f172b2f05c4e1ffaa1e861852911131e1fe6;p=akkoma

Merge branch 'config-changes' into 'develop'

Config changes

Closes #1547

See merge request pleroma/pleroma!2174
---

5499f172b2f05c4e1ffaa1e861852911131e1fe6