From: lain <lain@soykaf.club>
Date: Mon, 25 May 2020 12:00:53 +0000 (+0000)
Subject: Merge branch 'flaky-tests' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6783d544b2d3856bda3f8f9136011923ee8b30fe;p=akkoma

Merge branch 'flaky-tests' into 'develop'

Flaky tests

See merge request pleroma/pleroma!2578
---

6783d544b2d3856bda3f8f9136011923ee8b30fe