Conflicts: - `app/helpers/formatting_helper.rb`: Upstream removed OTel instrumentation around some code modified in glitch-soc because of the Markdown rendering feature. Removed the OTel instrumentation as upstream did.
Setting.authorized_fetch
image_pack_tag
icon
InstanceVariables
IpBlock.severity...
config_for