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
auth/confirmations
oauth/authorized_applications
x.mastodon
media#player
config_for
LOCAL_DOMAIN
http_message_signatures