Merge upstream/master

README.md

@@ -6,6 +6,7 @@ Desktop application for [Jitsi Meet] built with [Electron].
 
 ## Features
 
+- [End-to-End Encryption](https://jitsi.org/blog/e2ee/) support (BETA)
 - Works with any Jitsi Meet deployment
 - Local settings
 - Builtin auto-updates

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jitsi-meet-electron",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "Electron application for Freifunk Meet",
   "main": "./build/main.js",
   "productName": "FreifunkMeet",
@@ -115,7 +115,7 @@
     "electron-updater": "4.2.5",
     "electron-window-state": "5.0.3",
     "history": "4.10.1",
-    "jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#57fed63bf495b698785edd741364d420898b288e",
+    "jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v2.0.7",
     "js-utils": "github:jitsi/js-utils#cf11996bd866fdb47326c59a5d3bc24be17282d4",
     "moment": "2.23.0",
     "mousetrap": "1.6.2",
@@ -145,7 +145,7 @@
     "css-loader": "3.5.0",
     "devtron": "1.4.0",
     "electron": "9.0.0",
-    "electron-builder": "22.6.1",
+    "electron-builder": "22.3.6",
     "electron-react-devtools": "0.5.3",
     "eslint": "6.5.1",
     "eslint-config-jitsi": "github:jitsi/eslint-config-jitsi#1.0.2",