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

# Conflicts: # pnpm-lock.yaml
2026-06-09 14:05:01 +01:00
parent c1ecf49dca 4ebabd8341
commit a74add6fbd
5 changed files with 32 additions and 7 deletions
@@ -3,7 +3,7 @@
    "productName": "Element",
    "main": "lib/electron-main.js",
    "exports": "./lib/electron-main.js",
-    "version": "1.12.20",
+    "version": "1.12.21",
    "description": "Element: the future of secure communication",
    "author": {
        "name": "Element",