Merge remote-tracking branch 'MichMich/develop'

This commit is contained in:
Thomas Bachmann
2017-01-11 11:32:20 +01:00
parent c302030301
commit 3ba16f1773
10 changed files with 79 additions and 25 deletions

View File

@@ -28,7 +28,8 @@ function createWindow() {
webPreferences: {
nodeIntegration: false,
zoomFactor: config.zoom
}
},
backgroundColor: "#000000"
}
// DEPRECATED: "kioskmode" backwards compatibility, to be removed