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:27:08 +0000 (17:27 +0000)
commitea1867f48efbab8dd3349fa653ba1d6cb271c8dd
treebbe70f964fae284e02501237456a3a7d458febdc
parent90b0bd3984c15b25fde5ae29e23b97a38071fb36
Merge branch 'config-changes' into 'develop'

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

See merge request pleroma/pleroma!1666

(cherry picked from commit 9c64a25713790fefa8b5c419aeadf55113c17073)

69faec03 markdown generation to the new file
c625fe6f config.md back
4da0da9a don't track generated_config.md
.gitignore
docs/config.md
lib/pleroma/docs/markdown.ex
mix.exs