Merge branch 'split-masto-api/leftovers' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 19:28:53 +0000 (19:28 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 19:28:53 +0000 (19:28 +0000)
[#1278] Move a few more actions from MastodonAPIController

See merge request pleroma/pleroma!1761

1  2 
lib/pleroma/web/router.ex

Simple merge