Merge branch 'fix/race-in-tests' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 16 Sep 2019 07:36:57 +0000 (07:36 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 16 Sep 2019 07:36:57 +0000 (07:36 +0000)
commit74eba5afe20124646366aace98c2e1b106712108
tree6a22783bec4d01c9d2a7624c14f7b064178cc38b
parent2990c0a53b14646eab19b57d068ac8aa7e17ea4e
parentca88e37a8f3b0b52771f94df676e26471fb44019
Merge branch 'fix/race-in-tests' into 'develop'

Fix a race condition in tests

See merge request pleroma/pleroma!1673