Merge branch 'master' into v2.0.0-Release

Cloud-Automation · Nov 26, 2016 · 8b7ec72 · 8b7ec72
2 parents 6334ab3 + d2c6bae
commit 8b7ec72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 node_modules
 *.swp
-*.idea
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "node" : ">=4.5.0"
   },
   "dependencies": {
-    "bluebird": "^3.4.6",
+    "put": "0.0.6",
+    "q": "1.0.1",
     "crc": "3.4.0",
     "serialport": "^4.0.1",
     "stampit": "^2.1.2",