Merge branch 'test-timeout' into 'develop'
authorlain <lain@soykaf.club>
Thu, 12 Dec 2019 09:31:50 +0000 (09:31 +0000)
committerlain <lain@soykaf.club>
Thu, 12 Dec 2019 09:31:50 +0000 (09:31 +0000)
Fix intermittent failures in federated testing

See merge request pleroma/pleroma!2058


Trivial merge