Merge branch 'master' into plugins

2017-04-16 13:29:51 -03:00
parent 568fede67e a82498ba16
commit 957c5b64e9
34 changed files with 318 additions and 166 deletions
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -227,7 +227,7 @@ function processArgv (argv) {
      // Ignore hidden argument, already being handled
    } else if (arg.startsWith('-psn')) {
      // Ignore Mac launchd "process serial number" argument
-      // Issue: https://github.com/feross/webtorrent-desktop/issues/214
+      // Issue: https://github.com/webtorrent/webtorrent-desktop/issues/214
    } else if (arg.startsWith('--')) {
      // Ignore Spectron flags
    } else if (arg === 'data:,') {