Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Sat, 14 Sep 2019 18:14:54 +0000 (18:14 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 14 Sep 2019 18:14:54 +0000 (18:14 +0000)
Backport a test fix to 1.1

See merge request pleroma/pleroma!1671


Trivial merge