Merge branch 'chore/fixup-testsuite-import' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 19 Oct 2019 23:20:38 +0000 (23:20 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 19 Oct 2019 23:20:38 +0000 (23:20 +0000)
commit1311884a1d35fa091b850e3a4d310a8da29059da
tree4203782915925b21996c2d860ad150391e45a138
parentf01dbc450c658ac1a03b91b7ff3ba8d5ea1454e5
parentcd90735a4b0dad01cca84d93b4fd671289e992b7
Merge branch 'chore/fixup-testsuite-import' into 'develop'

tests: ostatus controller tests: fix sporadic compilation failure

See merge request pleroma/pleroma!1867