imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev

Browse source
This commit is contained in:
Travis Ralston 2020-01-09 13:43:25 -07:00
commit 9bf1c65971
8 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
electron_app/src/electron-main.js
View file

@ -63,7 +63,7 @@ if (argv["help"]) {
console.log(" --hidden: Start the application hidden in the system tray.");
console.log(" --help: Displays this help message.");
console.log("And more such as --proxy, see:" +
"https://github.com/electron/electron/blob/master/docs/api/chrome-command-line-switches.md");
"https://electronjs.org/docs/api/chrome-command-line-switches#supported-chrome-command-line-switches");
app.exit();
}