mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 11:11:11 +02: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.