From: kaniini <ariadne@dereferenced.org>
Date: Fri, 4 Oct 2019 21:47:34 +0000 (+0000)
Subject: Merge branch 'backport/issue-1296' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1dd6d81ddf6a4d20830a7a9086e843b4aafda05f;p=akkoma

Merge branch 'backport/issue-1296' into 'maint/1.1'

backport 1296 fix to maint/1.1

See merge request pleroma/pleroma!1790
---

1dd6d81ddf6a4d20830a7a9086e843b4aafda05f