From: rinpatch <rinpatch@sdf.org>
Date: Sat, 14 Sep 2019 17:26:35 +0000 (+0000)
Subject: Merge branch 'config-changes' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=9c64a257;p=akkoma

Merge branch 'config-changes' into 'develop'

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

See merge request pleroma/pleroma!1666
---

9c64a25713790fefa8b5c419aeadf55113c17073