Merge branch 'master' into greenkeeper/react-i18next-6.0.4

terrestris · Oct 4, 2017 · b453ef8 · b453ef8
2 parents 6fd3680 + ae38409
commit b453ef8
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 103 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "loglevel": "1.5.0",
     "prop-types": "15.6.0",
     "react-dom": "16.0.0",
-    "react-fa": "4.2.0",
+    "react-fa": "5.0.0",
     "react-i18next": "6.0.4",
     "react-rnd": "7.1.4",
     "url-parse": "1.1.9"
@@ -91,8 +91,8 @@
     "babel-preset-stage-0": "6.24.1",
     "coveralls": "3.0.0",
     "css-loader": "0.28.7",
-    "enzyme": "3.0.0",
-    "enzyme-adapter-react-16": "1.0.0",
+    "enzyme": "3.1.0",
+    "enzyme-adapter-react-16": "1.0.1",
     "eslint": "4.8.0",
     "eslint-plugin-html": "3.2.2",
     "eslint-plugin-markdown": "1.0.0-beta.7",
@@ -119,7 +119,7 @@
     "metalsmith-layouts": "1.8.1",
     "metalsmith-markdown": "0.2.1",
     "minami": "1.2.3",
-    "mocha": "3.5.3",
+    "mocha": "4.0.0",
     "react-test-renderer": "16.0.0",
     "rimraf": "2.6.2",
     "sinon": "4.0.0",