From: kaniini <ariadne@dereferenced.org>
Date: Mon, 30 Sep 2019 12:53:43 +0000 (+0000)
Subject: Merge branch 'split-masto-api/mascots' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a22a7437d84065192601f73da73d2c27111c9b15;p=akkoma

Merge branch 'split-masto-api/mascots' into 'develop'

Extract mascot actions from `MastodonAPIController` to MascotController

See merge request pleroma/pleroma!1745
---

a22a7437d84065192601f73da73d2c27111c9b15