mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-17 21:22:55 -05:00
9adeaf2bfc
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system