Merge branch 'master' into greenkeeper/eslint-config-airbnb-base-11.1.0

Xiphe · Feb 6, 2017 · 3c5fd49 · 3c5fd49
2 parents d45a5a8 + f5e4434
commit 3c5fd49
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -29,14 +29,14 @@
   },
   "devDependencies": {
     "deep-freeze": "0.0.1",
-    "eslint": "3.14.1",
+    "eslint": "3.15.0",
     "eslint-config-airbnb-base": "11.1.0",
     "eslint-plugin-import": "2.2.0",
     "gulp": "gulpjs/gulp#4.0",
     "gulp-toolbox-pipe-coverage-istanbul": "0.2.4",
     "gulp-toolbox-reporter-coveralls": "0.1.1",
     "gulp-toolbox-test-node-jasmine": "0.2.5",
-    "proxyquire": "1.7.10",
+    "proxyquire": "1.7.11",
     "semantic-release": "6.3.2",
     "uberconfig": "0.2.1",
     "undertaker-task-provider-registry": "1.2.1"