Merge branch 'master' into upgrade-ra

Awesome-Technologies · Feb 2, 2024 · 0a44379 · 0a44379
2 parents 4c134d2 + d8d393c
commit 0a44379
Show file tree

Hide file tree

Showing 2 changed files with 343 additions and 130 deletions.
diff --git a/package.json b/package.json
@@ -25,14 +25,15 @@
     "@emotion/styled": "^11.10.6",
     "@mui/icons-material": "^5.14.19",
     "@mui/material": "^5.14.8",
+    "@mui/styles": "5.14.10",
     "papaparse": "^5.4.1",
     "prop-types": "^15.8.1",
     "ra-language-chinese": "^2.0.10",
     "ra-language-french": "^4.16.2",
     "ra-language-german": "^3.13.4",
     "ra-language-italian": "^3.13.1",
     "react": "^17.0.0",
-    "react-admin": "^4.7.3",
+    "react-admin": "^4.7.6",
     "react-dom": "^17.0.2",
     "react-scripts": "^5.0.1"
   },