Conflicts: - `.eslintrc.js`: Upstream moved it to `eslint.config.mjs`. Ported the glitch-soc changes there. - `yarn.lock`: Upstream updated dependencies close to glitch-soc-only dependencies. Ported upstream's changes.
app/javascript/hooks
app/javascript/mastodon/hooks
react-notification
Deprecation
typescript-eslint