mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-19 17:13:48 -05:00
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system