mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 07:49:29 +00:00
Conflicts: - `app/helpers/theme_helper.rb`: Upstream removed the feature flag and refactored, while we have a slightly different theming system. Updated accordingly. - `stylelint.config.js`: Upstream removed overrides for the temporary themes. Did the same.