Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.
Setting.authorized_fetch
InstanceVariables
/share
Rails.application.routes.url_helpers