Conflicts: - `app/models/user_settings.rb`: Not a real conflict, upstream added a setting on a line adjacent to a glitch-soc-only line. Added upstream's new setting.
auth/passwords
disputes/strikes
filters/statuses
frontend_translations
SystemHelpers
statuses_cleanup
statuses