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)
commite71d662d3a7d8166ca2ccc32b36ea7ba666dcf19
treebbe70f964fae284e02501237456a3a7d458febdc
parent90b0bd3984c15b25fde5ae29e23b97a38071fb36
parentea1867f48efbab8dd3349fa653ba1d6cb271c8dd
Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'

Backport config.md readdition to 1.1

See merge request pleroma/pleroma!1670