Merge branch 'refactor/timeline-controller' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Fri, 27 Sep 2019 03:42:30 +0000 (03:42 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 27 Sep 2019 03:42:30 +0000 (03:42 +0000)
commitdc0fdb5e8446e8ad607de53a08ac616bc03516cf
tree4f7b03bd62bbd988519971b3fe87d80c04bd7a26
parent67a659a096ecadc66eac1018d87516a149825c0a
parent3572cf29b7374947ebfbb42a20d370a75f5f0a40
Merge branch 'refactor/timeline-controller' into 'develop'

Extract timeline actions from `MastodonAPIController` into `TimelineController`

See merge request pleroma/pleroma!1648