Merge branch 'master' into greenkeeper/@types/mocha-2.2.48

qlik-oss · Feb 5, 2018 · febfff1 · febfff1
2 parents b5b5cf4 + 28ce194
commit febfff1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "babel-preset-env": "1.6.1",
     "babel-register": "6.26.0",
     "coveralls": "3.0.0",
-    "eslint": "4.16.0",
+    "eslint": "4.17.0",
     "eslint-config-airbnb-base": "12.0.2",
     "eslint-plugin-import": "2.7.0",
     "requirejs": "2.3.5",