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)
commit7a318d74e64fd0df9b3be202810dee2119862aba
tree150951d58d24ad7d510ca12ccc1b34545f1f5bac
parent45b7f03f89ac4ef308720dc7f6d1230c63a6e197
parente0c68eeb024c7d91b098c4e0eb6ad57551ea9ef1
Merge branch 'split-masto-api/leftovers' into 'develop'

[#1278] Move a few more actions from MastodonAPIController

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