Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
swarthy authored Jan 20, 2017
2 parents 6e8d1a7 + 2a0410b commit ac9ab2e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ node_js:
- 4
- 5
- 6
- 7
notifications:
email: false
webhooks:
Expand All @@ -18,4 +19,4 @@ deploy:
on:
tags: true
repo: trailsjs/trailpack-realtime
node: 6
node: 7
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "trailpack-realtime",
"version": "0.0.3",
"version": "2.0.0",
"description": "Realtime Trailpack. Synchronize the client and server via WebSockets",
"homepage": "http://www.trailsjs.io/",
"author": "Trails.js Team <[email protected]>",
Expand All @@ -27,14 +27,14 @@
"primus"
],
"dependencies": {
"engine.io": "^1.6.11",
"engine.io": "^1.8.2",
"primus": "^6.0.3",
"trailpack": "^1.0.5"
"trailpack": "^2.1.0"
},
"devDependencies": {
"eslint": "^2.13.1",
"eslint-config-trails": "^1.0.7",
"mocha": "^2.5.3"
"eslint": "^3.13.1",
"eslint-config-trails": "^2.0.6",
"mocha": "^3.2.0"
},
"scripts": {
"test": "eslint ."
Expand Down

0 comments on commit ac9ab2e

Please sign in to comment.