Merge branch '1.5.4-patch'

socketio · Sep 9, 2015 · 7e77dd5 · 7e77dd5 · sanemat · Sep 10, 2015
2 parents 8705870 + 6032a13
commit 7e77dd5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/History.md b/History.md
@@ -1,4 +1,9 @@
 
+1.5.4 / 2015-09-09
+==================
+
+  * package: bump `engine.io-parser`
+
 1.5.3 / 2015-09-09
 ==================
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "engine.io",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "The realtime engine behind Socket.IO. Provides the foundation of a bidirectional connection between client and server",
   "main": "./lib/engine.io",
   "author": "Guillermo Rauch <[email protected]>",
@@ -26,15 +26,15 @@
   "license": "MIT",
   "dependencies": {
     "debug": "2.1.3",
-    "ws": "0.7.2",
-    "engine.io-parser": "1.2.1",
+    "ws": "0.8.0",
+    "engine.io-parser": "1.2.2",
     "accepts": "1.1.4"
   },
   "devDependencies": {
     "mocha": "1.12.0",
     "expect.js": "0.2.0",
     "superagent": "0.15.4",
-    "engine.io-client": "socketio/engine.io-client#master",
+    "engine.io-client": "socketio/engine.io-client#79c97b9",
     "s": "0.1.1"
   },
   "scripts": {