Conflicts: - `tsconfig.json`: glitch-soc had extra paths under `app/javascript/flavours`, but upstream added `app/javascript` as a whole, so updated to upstream's.
auth/passwords
disputes/strikes
filters/statuses
let
SystemHelpers
frontend_translations
statuses_cleanup
statuses