Merge branch 'feature/ostatus-removal' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Fri, 18 Oct 2019 16:04:57 +0000 (16:04 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 18 Oct 2019 16:04:57 +0000 (16:04 +0000)
commit4053a82f41691195d1b29cc9eb3f6ed6814ee12f
tree31075bdd659c45b688e3b670acc5c9b41a7abc63
parent223c0c0136be81a363b114538948e8e0317540af
parentc2ae6310dc09e65515c7b8774d2b85b5ef7da1a1
Merge branch 'feature/ostatus-removal' into 'develop'

ostatus removal

Closes #1145

See merge request pleroma/pleroma!1854