mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-22 18:43:49 -05:00
Conflicts: - `app/helpers/theme_helper.rb`: Conflict because upstream refactored theme-related code, and glitch-soc has a different theming system.