Merge branch 'master' into 2.x

2016-10-07 13:30:21 -06:00 · 2016-10-07 13:30:21 -06:00 · 9d1d8be97e
parent 1b988ddd91 3737455eed
commit 9d1d8be97e
1 changed files with 1 additions and 1 deletions
--- a/serve.js
+++ b/serve.js
@ -214,7 +214,7 @@ function run() {
      key: httpsOptions.key
    , cert: httpsOptions.cert
    //, ca: httpsOptions.ca
-  }
+    }
  , argv: argv
  };
  var peerCa;