Conflicts: - `app/services/backup_service.rb`: Upstream refactored activity serialization while glitch-soc passed an extra argument. Followed upstream's refactor, keeping our extra argument.
admin/confirmations
set_locale
disputes/strikes
filters/statuses
let
SystemHelpers
media#player
statuses_cleanup
statuses