Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 22 Mar 2019 00:25:35 +0000 (00:25 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 22 Mar 2019 00:25:35 +0000 (00:25 +0000)
commitb548181b52c4397d5034cfd95b2ef7e05c9c9c22
treea847bb70d52da43b2f0cca45f7ea49cb4e664c5a
parentbf8b29e080a6a8a369abb53a26229bb0544de1c0
parenta223e65f35da158ef79f05f65316920dcecaa54b
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'

Mastodon API: add conversation_id extension

See merge request pleroma/pleroma!961