Merge branch 'split-masto-api/instance' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Wed, 2 Oct 2019 10:46:14 +0000 (10:46 +0000)
committerkaniini <ariadne@dereferenced.org>
Wed, 2 Oct 2019 10:46:14 +0000 (10:46 +0000)
commit433f2c0f6854d2838819e08f0fb0a9e8cf058021
treed098664dc27ca996f5797ac5b7fcddc282fe4869
parentdebd0a306697f629dd8a9c2e4bf3a9b5f87db77e
parentc8b01f6667a9b5b158103de449a7769c9274bcc3
Merge branch 'split-masto-api/instance' into 'develop'

Extract instance actions from `MastodonAPIController` to `InstanceController`

See merge request pleroma/pleroma!1760