Merge remote-tracking branch 'origin/master' into develop

# Conflicts: # pnpm-lock.yaml
2026-08-05 12:31:36 +01:00
parent c8f75a4f7c a2a996ae50
commit b4f7cf665d
4 changed files with 50 additions and 9 deletions
@@ -3,7 +3,7 @@
    "productName": "Element",
    "main": "lib/electron-main.js",
    "exports": "./lib/electron-main.js",
-    "version": "1.12.24",
+    "version": "1.12.25",
    "description": "Element: the future of secure communication",
    "author": {
        "name": "Element",