projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9585ec 40c51f1)
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)
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


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git