Merge branch 'master' into batchMax

teonimesic · Jun 20, 2017 · a8ecb34 · a8ecb34
2 parents 74239ad + 42d120b
commit a8ecb34
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "@types/chai-as-promised": "0.0.31",
     "@types/lodash": "4.14.65",
     "@types/mocha": "^2.2.31",
-    "@types/node": "7.0.29",
+    "@types/node": "7.0.32",
     "@types/promises-a-plus": "0.0.27",
     "@types/sinon": "^2.1.0",
     "benchmark": "^2.1.3",
@@ -95,7 +95,7 @@
     "tslint": "^5.1.0",
     "typescript": "2.3.4",
     "uglify-js": "^3.0.16",
-    "webpack": "^2.1.0-beta.28",
+    "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.4.0"
   },
   "optionalDependencies": {