Merge branch 'split-masto-api/mascots' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 12:53:43 +0000 (12:53 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 12:53:43 +0000 (12:53 +0000)
commita22a7437d84065192601f73da73d2c27111c9b15
tree94248ac50e6a9adcf2e6d02ec866a89e0ddcb27b
parentdfab2232f8238b1560e447c2f855479746045fe1
parent0c6009dd2e475d3487123390885c46bf3fc5dea8
Merge branch 'split-masto-api/mascots' into 'develop'

Extract mascot actions from `MastodonAPIController` to MascotController

See merge request pleroma/pleroma!1745