From: rinpatch <rinpatch@sdf.org>
Date: Sat, 14 Sep 2019 18:14:21 +0000 (+0000)
Subject: Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e71d662d3a7d8166ca2ccc32b36ea7ba666dcf19;p=akkoma

Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'

Backport config.md readdition to 1.1

See merge request pleroma/pleroma!1670
---

e71d662d3a7d8166ca2ccc32b36ea7ba666dcf19