Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream

Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
This commit is contained in:
Claire
2026-05-22 19:43:42 +02:00
144 changed files with 1363 additions and 1158 deletions
+2 -2
View File
@@ -3,7 +3,7 @@
"license": "AGPL-3.0-or-later",
"packageManager": "yarn@4.14.1",
"engines": {
"node": ">=20"
"node": ">=22"
},
"workspaces": [
".",
@@ -178,7 +178,7 @@
"fake-indexeddb": "^6.0.1",
"globals": "^17.3.0",
"husky": "^9.0.11",
"lint-staged": "^16.2.6",
"lint-staged": "^17.0.0",
"msw": "^2.12.1",
"msw-storybook-addon": "^2.0.6",
"oxfmt": "^0.47.0",