Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Sat, 14 Sep 2019 18:14:21 +0000 (18:14 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 14 Sep 2019 18:14:21 +0000 (18:14 +0000)
Backport config.md readdition to 1.1

See merge request pleroma/pleroma!1670


Trivial merge