Merge branch 'master' into snyk-upgrade-93b233a54095fee59b3fe1b0edd02520

maxiplux · Sep 24, 2019 · 6bb013b · 6bb013b
2 parents dc81e36 + 09224f4
commit 6bb013b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 26 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.3.2",
     "react-dom": "16.3.2",
     "react-redux": "5.0.7",
-    "redux": "4.0.4"
+    "react-redux": "5.1.1"
   }
 }