Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Absurdon 2017-03-08 23:37:41 +01:00
commit c4fa6a424c

View file

@ -61,7 +61,7 @@
"serve-favicon": "~2.3.0",
"socket.io": "~1.3.7",
"socket.io-client": "~1.3.0",
"steam": "~1.1.0",
"steam": "~1.4.0",
"steamidconvert": "~0.2.4",
"toastr": "~2.1.2",
"uglify-js-brunch": ">= 1.0 < 1.8",
@ -70,10 +70,10 @@
"devDependencies": {
"chai": "~3.1.0",
"mocha": "~2.2.5",
"nodemon": "~1.3.7",
"nodemon": "~1.4.0",
"supertest": "~1.0.1"
},
"engines": {
"node": "4.2.3"
"node": "4.8.0"
}
}