Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ian Craggs committed Jun 4, 2019
2 parents c40602f + 438c494 commit f585946
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js: 5
node_js: 8
before_install:
- ./start-broker.sh
script:
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"license": "EPL-1.0",
"devDependencies": {
"dotenv": "^4.0.0",
"eslint": "^4.12.1",
"jasmine-node": "1.14.x",
"jsdoc": "^3.5.5",
"eslint": "^4.19.1",
"jasmine-node": "^3.0.0",
"jsdoc": "^3.6.2",
"node-localstorage": "1.3.x",
"websocket": "1.x.x"
}
Expand Down

0 comments on commit f585946

Please sign in to comment.