mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
Conflicts: - `spec/helpers/theme_helper_spec.rb`: Conflict due to glitch-soc's different theming system. Adapted upstream changes to glitch-soc's theming system.