Merge branch '1.x' into 2.x

This commit is contained in:
AJ ONeal 2016-10-20 22:34:04 -06:00
commit 4aa9814dc6
2 changed files with 3 additions and 3 deletions

View File

@ -2,12 +2,12 @@
"name": "serve-https", "name": "serve-https",
"version": "2.0.2", "version": "2.0.2",
"description": "Serves HTTPS using TLS (SSL) certs for localhost.daplie.com - great for testing and development.", "description": "Serves HTTPS using TLS (SSL) certs for localhost.daplie.com - great for testing and development.",
"main": "serve.js", "main": "bin/serve-https.js",
"scripts": { "scripts": {
"test": "node serve.js -p 1443 -d /tmp/" "test": "node bin/serve-https.js -p 8443 -d /tmp/"
}, },
"bin": { "bin": {
"serve-https": "serve.js" "serve-https": "./bin/serve-https.js"
}, },
"repository": { "repository": {
"type": "git", "type": "git",