Merge branch 'master' of github.com:ParsePlatform/parse-server

This commit is contained in:
Fosco Marotto
2016-02-02 18:08:37 -08:00
2 changed files with 5 additions and 1 deletions

3
.gitignore vendored
View File

@@ -28,3 +28,6 @@ node_modules
# Emacs # Emacs
*~ *~
# WebStorm/IntelliJ
.idea

View File

@@ -22,10 +22,11 @@
"request": "^2.65.0" "request": "^2.65.0"
}, },
"devDependencies": { "devDependencies": {
"istanbul": "^0.4.2",
"jasmine": "^2.3.2" "jasmine": "^2.3.2"
}, },
"scripts": { "scripts": {
"test": "TESTING=1 ./node_modules/.bin/jasmine" "test": "TESTING=1 ./node_modules/.bin/istanbul cover --include-all-sources ./node_modules/.bin/jasmine"
}, },
"engines": { "engines": {
"node": ">=4.1" "node": ">=4.1"