Merge branch 'split-masto-api/media' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 1 Oct 2019 07:57:46 +0000 (07:57 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 1 Oct 2019 07:57:46 +0000 (07:57 +0000)
commitb4369e7e6837a735c8cbb19c3c131d23fb74a835
tree9927b795fe0473ac8ead0692c40408d8d0d3292e
parentf0b4ba1bf9023c4300e1e67aa4666f05cab8409e
parent585bc57edbe10dcd19d2294824e0a0600f4bfe4c
Merge branch 'split-masto-api/media' into 'develop'

Extract media actions from `MastodonAPIController` to `MediaController`

See merge request pleroma/pleroma!1756