Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Fri, 11 Oct 2019 19:39:37 +0000 (19:39 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 11 Oct 2019 19:39:37 +0000 (19:39 +0000)
commitd9410c488a85bc8da87c1b662ed0a8ffac4d6466
treed97f1a50aa1fdd22c351e91214e0077cc62ea8e4
parentac113f672479320e77592239d2af5e0c4fcb1342
parentfbbb032bc510e3097115ca37c4138d811c1d5912
Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'

Backport pleroma-ctl enchancements to maint

See merge request pleroma/pleroma!1833