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)
commit6c3f5e8ba0b164ef50e0c7bf0fe36223f821b680
tree8f722d63536585b3192b63cf6bf843ccf8b21f6c
parente71d662d3a7d8166ca2ccc32b36ea7ba666dcf19
parentc64ab84e6a4aef18d4d38d11d445777be09f8e00
Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'

Backport a test fix to 1.1

See merge request pleroma/pleroma!1671