Merge branch 'split-masto-api/conversations' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 10:49:40 +0000 (10:49 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 10:49:40 +0000 (10:49 +0000)
commit74d8fadf3745a4b4203c2cead35b741554ccc439
tree622845f758a038a1f637f7a406b02d88c45ded00
parentf889e8e309aafa99981292b25e4e151ab1987685
parentd4d88b3361ea57d763c5093470b7ebaee6bcf11c
Merge branch 'split-masto-api/conversations' into 'develop'

Extract conversation actions from `MastodonAPIController` to ConversationController

See merge request pleroma/pleroma!1743
lib/pleroma/web/router.ex