From: rinpatch <rinpatch@sdf.org>
Date: Sat, 14 Sep 2019 18:14:54 +0000 (+0000)
Subject: Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6c3f5e8ba0b164ef50e0c7bf0fe36223f821b680;p=akkoma

Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'

Backport a test fix to 1.1

See merge request pleroma/pleroma!1671
---

6c3f5e8ba0b164ef50e0c7bf0fe36223f821b680