Merge branch 'fix/test-fix' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 24 Sep 2020 09:50:39 +0000 (09:50 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 24 Sep 2020 09:50:39 +0000 (09:50 +0000)
commit151df9fc17ec01ab566c433571a263741ed1844f
treeb41866ddf065cdd9ef99f80a0ff3eb9d2407db23
parent47cd59342f0f82415b04e36e05741e0fcafdbdcc
parent165961f56dfa20d27869f53777798a8d4ce572f9
Merge branch 'fix/test-fix' into 'develop'

Fix for test on mac

See merge request pleroma/pleroma!3027