From: rinpatch <rinpatch@sdf.org>
Date: Mon, 30 Sep 2019 16:16:22 +0000 (+0000)
Subject: Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=56c91d1323ac354c89aa9fa79df2be0999460e3c;p=akkoma

Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'

Backport !1749 to 1.1

See merge request pleroma/pleroma!1751
---

56c91d1323ac354c89aa9fa79df2be0999460e3c