Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed.
well_known/webfinger
before_all
requests/cache_spec
RSpec/ExampleLength
remote_interaction_helper