Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version.
Setting.authorized_fetch
InstanceVariables
/share
Rails.application.routes.url_helpers
picture_hint