Merge branch 'fix/test-failure-due-to/306' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 6 Sep 2018 06:50:15 +0000 (06:50 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 6 Sep 2018 06:50:15 +0000 (06:50 +0000)
commit403f9d118dadcef806044831221d5c67800ce34d
tree6111a8df69580da8fe63b4bcddff201f4a4c4d2c
parent4a3dbd9d4e052969460bad19dfc535908027ed03
parentff38ffd9f89a513aa35268fe229de01478cb51d5
Merge branch 'fix/test-failure-due-to/306' into 'develop'

Fix the tests

See merge request pleroma/pleroma!332