From: rinpatch <rinpatch@sdf.org>
Date: Fri, 11 Oct 2019 19:39:37 +0000 (+0000)
Subject: Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d9410c488a85bc8da87c1b662ed0a8ffac4d6466;p=akkoma

Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'

Backport pleroma-ctl enchancements to maint

See merge request pleroma/pleroma!1833
---

d9410c488a85bc8da87c1b662ed0a8ffac4d6466