Merge branch 'split-masto-api/domain-blocks' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Fri, 27 Sep 2019 07:54:08 +0000 (07:54 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 27 Sep 2019 07:54:08 +0000 (07:54 +0000)
commit68bf99baf21b4728faab6641ed8dbdafa79d5fb6
tree5d9674400d17405a23a16dadcdcf05e3a34ab4aa
parent27a3221d5759c0b2ec6864ce3c315411e6159198
parent408750b94e1374c815c80a1060892231f40b54fb
Merge branch 'split-masto-api/domain-blocks' into 'develop'

Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

See merge request pleroma/pleroma!1729
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/router.ex
test/web/mastodon_api/mastodon_api_controller_test.exs