From: lain <lain@soykaf.club>
Date: Thu, 12 Dec 2019 09:31:50 +0000 (+0000)
Subject: Merge branch 'test-timeout' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=68a667a465f0c51ba9842742ef010da7b69d7a69;p=akkoma

Merge branch 'test-timeout' into 'develop'

Fix intermittent failures in federated testing

See merge request pleroma/pleroma!2058
---

68a667a465f0c51ba9842742ef010da7b69d7a69