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

Xiphe · Jan 10, 2017 · ff0581a · ff0581a
2 parents 1cd53e7 + 8087c54
commit ff0581a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "url": "https://github.com/Xiphe/uberconfig.git"
   },
   "devDependencies": {
-    "eslint": "3.12.2",
+    "eslint": "3.13.0",
     "eslint-config-airbnb-base": "11.0.1",
     "eslint-plugin-import": "2.2.0",
     "gulp": "github:gulpjs/gulp#4.0",