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

Xiphe · Feb 6, 2017 · 85a38a9 · 85a38a9
2 parents 570833a + 460cb97
commit 85a38a9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -23,15 +23,15 @@
     "url": "https://github.com/Xiphe/uberconfig.git"
   },
   "devDependencies": {
-    "eslint": "3.14.1",
+    "eslint": "3.15.0",
     "eslint-config-airbnb-base": "11.1.0",
     "eslint-plugin-import": "2.2.0",
     "gulp": "github:gulpjs/gulp#4.0",
     "gulp-toolbox-pipe-coverage-istanbul": "0.2.5",
     "gulp-toolbox-registry": "0.4.2",
     "gulp-toolbox-reporter-coveralls": "0.1.2",
     "gulp-toolbox-test-node-jasmine": "0.2.5",
-    "proxyquire": "1.7.10",
+    "proxyquire": "1.7.11",
     "semantic-release": "6.3.2",
     "undertaker-task-provider-registry": "1.2.1"
   }