Skip to content

Commit

Permalink
Merge pull request #48 from csett86/release-2022-3-1
Browse files Browse the repository at this point in the history
Merge upstream release v2022.3.1
  • Loading branch information
awlx committed Mar 13, 2022
2 parents 9fb2444 + 95de0aa commit 1857327
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 45 deletions.
1 change: 0 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ function createJitsiMeetWindow() {
webPreferences: {
enableBlinkFeatures: 'WebAssemblyCSP',
contextIsolation: false,
nativeWindowOpen: true,
nodeIntegration: false,
preload: path.resolve(basePath, './build/preload.js')
}
Expand Down
65 changes: 24 additions & 41 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffmuc-meet",
"version": "2022.2.1",
"version": "2022.3.1",
"description": "Electron application for Freifunk Meet",
"main": "./build/main.js",
"productName": "FreifunkMeet",
Expand Down Expand Up @@ -126,7 +126,7 @@
"readmeFilename": "README.md",
"license": "Apache-2.0",
"dependencies": {
"@jitsi/electron-sdk": "^3.0.5",
"@jitsi/electron-sdk": "^3.0.6",
"electron-debug": "^3.2.0",
"electron-reload": "^1.5.0"
},
Expand Down Expand Up @@ -155,7 +155,7 @@
"babel-loader": "8.1.0",
"concurrently": "5.1.0",
"css-loader": "3.5.0",
"electron": "17.0.1",
"electron": "17.1.2",
"electron-builder": "22.11.11",
"electron-context-menu": "^2.5.0",
"electron-is-dev": "^1.2.0",
Expand Down

0 comments on commit 1857327

Please sign in to comment.