Merge remote-tracking branch 'origin/develop' into next-react-router-5

2022-03-21 16:05:25 -05:00
parent c6ab95349e 4782afed18
commit 228f16f930
46 changed files with 247 additions and 332 deletions
--- a/package.json
+++ b/package.json
@ -150,7 +150,7 @@
    "react-overlays": "^0.9.0",
    "react-popper": "^2.2.3",
    "react-redux": "^7.2.5",
-    "react-router-dom": "^4.3.1",
+    "react-router-dom": "^5.3.0",
    "react-router-scroll-4": "^1.0.0-beta.1",
    "react-simple-pull-to-refresh": "^1.3.0",
    "react-sparklines": "^1.7.0",