[chore] Merge 2.1.x branch (#494)

socketio · Mar 22, 2017 · ec5d208 · ec5d208
1 parent 120611f
commit ec5d208
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/History.md b/History.md
@@ -1,4 +1,9 @@
 
+2.1.1  / 2017-03-22
+===================
+
+  * [chore] Bump engine.io-parser to version 2.0.2
+
 2.1.0  / 2017-03-11
 ===================
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "engine.io",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "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 <guillermo@learnboost.com>",
@@ -28,14 +28,14 @@
     "accepts": "1.3.3",
     "base64id": "1.0.0",
     "debug": "2.3.3",
-    "engine.io-parser": "2.0.1",
+    "engine.io-parser": "2.0.2",
     "ws": "2.2.0",
     "cookie": "0.3.1"
   },
   "devDependencies": {
     "babel-eslint": "5.0.0",
     "babel-preset-es2015": "6.3.13",
-    "engine.io-client": "2.1.0",
+    "engine.io-client": "2.1.1",
     "eslint-config-standard": "4.4.0",
     "eslint-plugin-standard": "1.3.2",
     "expect.js": "0.2.0",