mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-14 16:28:59 +00:00
Conflicts: - `app/helpers/theme_helper.rb`: Upstream added an experimental feature flag to try out theme refactors. Glitch-soc's theming system is too different, so skips the new feature flag. - `stylelint.config.js`: Ditto.