Skip to content

Commit

Permalink
Merge pull request #34 from feathersjs/greenkeeper-feathers-rest-1.3.0
Browse files Browse the repository at this point in the history
[email protected] breaks build 🚨
  • Loading branch information
daffl committed Apr 28, 2016
2 parents c893d00 + 988c17b commit 45250af
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: node_js
node_js:
- '0.12'
- 'node'
- '5'
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"watch": "babel --watch -d lib/ src/",
"jshint": "jshint src/. test/. --config",
"mocha": "mocha test/ --compilers js:babel-core/register",
"test": "npm run jshint && npm run mocha && nsp check"
"test": "npm run jshint && npm run mocha"
},
"directories": {
"lib": "lib"
Expand All @@ -63,11 +63,10 @@
"body-parser": "^1.14.1",
"chai": "^3.4.1",
"feathers": "^2.0.0-pre.4",
"feathers-rest": "^1.1.1",
"feathers-rest": "^1.3.0",
"feathers-service-tests": "^0.5.2",
"jshint": "^2.8.0",
"mocha": "^2.3.3",
"nsp": "^2.2.0",
"sequelize": "^3.14.1",
"sqlite3": "^3.1.1"
}
Expand Down

0 comments on commit 45250af

Please sign in to comment.