Merge branch 'config-changes' into 'develop'
authorfeld <feld@feld.me>
Thu, 6 Feb 2020 16:02:46 +0000 (16:02 +0000)
committerfeld <feld@feld.me>
Thu, 6 Feb 2020 16:02:46 +0000 (16:02 +0000)
commit5499f172b2f05c4e1ffaa1e861852911131e1fe6
treeaae7861a939aacd06d827421faeda10fb4be2771
parent15cb1f6804fde19330a3c1f06eb24802c7503be3
parent7a2e153a8dec4337f16aeacab534f26f720cb5eb
Merge branch 'config-changes' into 'develop'

Config changes

Closes #1547

See merge request pleroma/pleroma!2174