mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-09 00:12:13 -05:00
- `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. - `spec/helpers/application_helper_spec.rb`: Minor conflict due to glitch-soc's theming system.