From: Haelwenn <git.pleroma.social@hacktivis.me>
Date: Thu, 20 Sep 2018 14:54:30 +0000 (+0000)
Subject: Merge branch 'feature/mastodon_api_2.5.0' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7458adc2567caf90c3b01ef4b8bf90a67cbc041c;p=akkoma

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
---

7458adc2567caf90c3b01ef4b8bf90a67cbc041c