Merge branch '0.5' of https://github.com/amark/gun into 0.5

This commit is contained in:
Mark Nadal 2016-11-28 19:41:11 -08:00
commit 71f15e21c6
2 changed files with 5 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
node_modules/*
npm-debug.log
gun.min.js
yarn.lock
*data.json
*.db

View File

@ -5,6 +5,7 @@
"main": "index.js",
"scripts": {
"start": "node examples/http.js 8080",
"prepublish": "uglifyjs2 gun.js -o gun.min.js -c -m",
"test": "mocha",
"unbuild": "node lib/unbuild.js"
},
@ -49,9 +50,10 @@
"ws": "~>1.0.1"
},
"devDependencies": {
"mocha": "~>1.9.0",
"express": "~>4.13.4",
"mocha": "~>1.9.0",
"panic-server": "~>0.3.0",
"selenium-webdriver": "~>2.53.2"
"selenium-webdriver": "~>2.53.2",
"uglify-js2": "^2.1.11"
}
}