Merge branch 'master' into greenkeeper/file-loader-1.1.11

terrestris · Mar 2, 2018 · 93ca041 · 93ca041
2 parents 38e2d49 + fa60879
commit 93ca041
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
     "eslint-plugin-react": "7.7.0",
     "file-loader": "1.1.11",
     "ink-docstrap": "1.3.2",
-    "jest": "22.1.4",
+    "jest": "22.4.2",
     "jsdoc": "3.5.5",
     "jsdoc-babel": "0.3.0",
     "jstransformer-handlebars": "1.1.0",