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)
commit9c64a25713790fefa8b5c419aeadf55113c17073
treea0943dea969cc66df9b7576d4085836862368798
parent62bbba80f35a7628e501c1937aecf2644a0b049b
parent4da0da9aa46f0970735f398a1786902f4e3a86eb
Merge branch 'config-changes' into 'develop'

two separate files for config.md and generated config.md

See merge request pleroma/pleroma!1666