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

# Conflicts: # pnpm-lock.yaml # pnpm-workspace.yaml
2026-06-09 12:39:57 +01:00
parent 6f46493b4d fa0b88ca9f
commit eaccc01687
46 changed files with 439 additions and 422 deletions
@@ -88,7 +88,7 @@
        "app-builder-lib": "26.12.1",
        "chokidar": "^5.0.0",
        "detect-libc": "^2.0.0",
-        "electron": "42.3.0",
+        "electron": "42.3.3",
        "electron-builder": "26.12.1",
        "electron-builder-squirrel-windows": "26.12.1",
        "electron-devtools-installer": "^4.0.0",