Merge branch 'config-changes' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 14 Sep 2019 17:26:35 +0000 (17:26 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 14 Sep 2019 17:26:35 +0000 (17:26 +0000)
two separate files for config.md and generated config.md

See merge request pleroma/pleroma!1666


Trivial merge