Conflicts: - `app/helpers/theme_helper.rb`: Conflict because of different theming system. Adapted upstream's changes. - `vite.config.mts`: Conflict because of different theming system. Adapted upstream's changes.
Setting.authorized_fetch
image_pack_tag
icon
InstanceVariables
IpBlock.severity...
config_for