Merge branch '1.5.2-patch'

socketio · Jul 9, 2015 · c7f265b · c7f265b
2 parents f3226b1 + 8e6139b
commit c7f265b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/History.md b/History.md
@@ -1,4 +1,9 @@
 
+1.5.2 / 2015-07-09
+==================
+
+  * package: bump `ws` to fix build issues
+
 1.5.1 / 2015-01-19
 ==================
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "engine.io",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "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]>",
@@ -35,7 +35,7 @@
     "mocha": "1.12.0",
     "expect.js": "0.2.0",
     "superagent": "0.15.4",
-    "engine.io-client": "automattic/engine.io-client#e595a72",
+    "engine.io-client": "1.5.2",
     "s": "0.1.1"
   },
   "scripts": {