diff options
author | rinpatch <rinpatch@sdf.org> | 2019-09-14 17:26:35 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-09-14 17:27:08 +0000 |
commit | ea1867f48efbab8dd3349fa653ba1d6cb271c8dd (patch) | |
tree | bbe70f964fae284e02501237456a3a7d458febdc /priv | |
parent | 90b0bd3984c15b25fde5ae29e23b97a38071fb36 (diff) | |
download | pleroma-ea1867f48efbab8dd3349fa653ba1d6cb271c8dd.tar.gz |
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
Diffstat (limited to 'priv')
0 files changed, 0 insertions, 0 deletions