mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 06:33:05 -05:00
64b2c712d4
Conflicts: - `app/helpers/theme_helper.rb`: Conflict because upstream refactored theme-related code, and glitch-soc has a different theming system.