mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-12 13:43:50 -05:00
Conflicts: - `app/controllers/api/v1/timelines/public_controller.rb`: Upstream refactored this code, the conflict was because of an extra supported parameter, `allow_local_only`. Updated the controller to follow upstream's refactor, and moved the extra parameter definition accordingly.