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.
x.mastodon
image_pack_tag
icon
Lint/NonLocalExitFromIterator
IpBlock.severity...
config_for