Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.
parsed_uri_query_values
change
admin/invites#deactivate_all
capture_emails
RSpec/LetSetup
spec/controllers
models/announcement
RSpec/InstanceVariable
RSpec/MultipleExpectations
controllers/statuses