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
+1 -1
View File
@@ -34,7 +34,7 @@
"cronstrue": "^3.0.0",
"eslint-plugin-matrix-org": "^3.0.0",
"husky": "^9.0.0",
"knip": "6.15.0",
"knip": "6.16.0",
"lint-staged": "^17.0.0",
"lodash": "^4.17.21",
"mermaid": "^11.13.0",