Merge branch 'develop' into feat/fe/statuspage-3

bluewave-labs · Jan 9, 2025 · ff7fe7f · ff7fe7f
2 parents a544a0f + 975e6d6
commit ff7fe7f
Show file tree

Hide file tree

Showing 49 changed files with 2,028 additions and 2,191 deletions.
diff --git a/Client/package-lock.json b/Client/package-lock.json
diff --git a/Client/package.json b/Client/package.json
@@ -14,9 +14,9 @@
 		"@emotion/react": "^11.13.3",
 		"@emotion/styled": "^11.13.0",
 		"@fontsource/roboto": "^5.0.13",
-		"@mui/icons-material": "6.3.0",
-		"@mui/lab": "6.0.0-beta.21",
-		"@mui/material": "6.3.0",
+		"@mui/icons-material": "6.3.1",
+		"@mui/lab": "6.0.0-beta.22",
+		"@mui/material": "6.3.1",
 		"@mui/x-charts": "^7.5.1",
 		"@mui/x-data-grid": "7.23.5",
 		"@mui/x-date-pickers": "7.23.3",

diff --git a/Client/src/Components/BasicTable/index.css b/Client/src/Components/BasicTable/index.css