Merge branch 'develop' of ssh://github.com/element-hq/element-web into t3chguy/merge-modules

# Conflicts:
#	pnpm-lock.yaml
#	pnpm-workspace.yaml
This commit is contained in:
Michael Telatynski
2026-06-09 12:39:57 +01:00
46 changed files with 439 additions and 422 deletions
+5 -4
View File
@@ -27,15 +27,16 @@ catalog:
# fonts
"@fontsource/inter": 5.2.8
# vite
vite: 8.0.15
vite: 8.0.16
vite-plugin-node-polyfills: 0.28.0
vite-plugin-svgr: 5.2.0
vitest: 4.1.7
"@vitest/coverage-v8": 4.1.7
"@vitest/browser-playwright": 4.1.7
vitest: 4.1.8
"@vitest/coverage-v8": 4.1.8
"@vitest/browser-playwright": 4.1.8
"@vitejs/plugin-react": 6.0.2
unplugin-dts: 1.0.1
packageExtensions:
fdir:
dependencies: