Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes.
Rails/*
Setting.authorized_fetch
InstanceVariables
/share
Rails.application.routes.url_helpers
picture_hint