Merge branch 'master' into greenkeeper/chokidar-2.0.0

qlik-oss · Jan 2, 2018 · be15621 · be15621
2 parents 7b6e59f + f462f54
commit be15621
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "koa-rewrite": "3.0.0",
     "koa-static": "4.0.2",
     "mkdirp": "0.5.1",
-    "mocha": "4.0.1",
+    "mocha": "4.1.0",
     "moment": "2.20.1",
     "nyc": "11.4.1",
     "precinct": "3.8.0",
@@ -62,7 +62,7 @@
     "babel-preset-env": "1.6.1",
     "babel-register": "6.26.0",
     "coveralls": "3.0.0",
-    "eslint": "4.13.1",
+    "eslint": "4.14.0",
     "eslint-config-airbnb-base": "12.0.2",
     "eslint-plugin-import": "2.7.0",
     "requirejs": "2.3.5",