projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f889e8e d4d88b3)
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)
Extract conversation actions from `MastodonAPIController` to ConversationController

See merge request pleroma/pleroma!1743

1  2 
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/web/router.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git