Conflicts: - `spec/controllers/api/v1/accounts/credentials_controller_spec.rb` Conflict due to glitch-soc's different note length handling. Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead.
well_known/webfinger
before_all
requests/cache_spec
RSpec/ExampleLength
remote_interaction_helper