Merge branch 'split-masto-api/filters' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Fri, 27 Sep 2019 07:52:27 +0000 (07:52 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 27 Sep 2019 07:52:27 +0000 (07:52 +0000)
commitc903d46a12333c50faaff340e7880bdf202b37fb
treeddba4cc7e42dadfca3eadce5b6aeff8dbe864064
parenta83c116df7527b9ae05b73f5ec5da69c0f123e04
parent621377f378c7cfde88f87356e9fd65ed6d9f6d50
Merge branch 'split-masto-api/filters' into 'develop'

Extract filter actions from `MastodonAPIController` to `FilterController`

See merge request pleroma/pleroma!1725