mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-21 01:53:51 -05:00
Conflicts: - `spec/controllers/api/v1/timelines/direct_controller_spec.rb`: `spec/controllers/api/v1/timelines` has been renamed, but we had an extra spec here for a glitch-soc-only endpoint. Kept glitch-soc's file unchanged (will port to a request spec later).