Merge branch 'feature/mastodon_api_2.5.0' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Thu, 20 Sep 2018 14:54:30 +0000 (14:54 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Thu, 20 Sep 2018 14:54:30 +0000 (14:54 +0000)
commit7458adc2567caf90c3b01ef4b8bf90a67cbc041c
treef0d31e8c06c7627abdc4cd54f8f935a304622b7b
parentc9585ec00760b46f013f36a7f7625ac36471d3e8
parent40c51f118f463127b2538e04fe3b29f90f89055d
Merge branch 'feature/mastodon_api_2.5.0' into 'develop'

Update mastodon API to 2.5.0

Closes: https://git.pleroma.social/pleroma/pleroma/issues/298
Closes: https://git.pleroma.social/pleroma/pleroma/issues/299
See: https://git.pleroma.social/pleroma/pleroma/merge_requests/351