Conflicts: - `config/settings.yml`: Not a real conflict, upstream removed settings that are identical in glitch-soc but textually adjacent to glitch-soc-only settings. Removed what upstream removed.
auth/passwords
disputes/strikes
filters/statuses
let
SystemHelpers
media#player
frontend_translations
statuses_cleanup
statuses