Merge branch 'master' into snyk-upgrade-e963f18366dac7096062d44e51288500

maxiplux · Sep 24, 2019 · c984f1d · c984f1d
2 parents 76a6865 + 8a6dc8a
commit c984f1d
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,6 +26,6 @@
     "react": "16.9.0",
     "react-dom": "16.3.2",
     "react-redux": "5.0.7",
-    "redux": "4.0.0"
+    "react-redux": "5.1.1"
   }
 }