Skip to content

Commit

Permalink
Merge branch 'master' into snyk-fix-272ee87f78984ae72a973d667d080e56
Browse files Browse the repository at this point in the history
  • Loading branch information
MrBmikhael authored Nov 19, 2024
2 parents 586d629 + c78cd3a commit 55303b8
Show file tree
Hide file tree
Showing 2 changed files with 185 additions and 148 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.6",
"@mui/material": "^5.14.15",
"@mui/icons-material": "^5.14.15",
"@mui/material": "^5.15.14",
"@mui/icons-material": "^5.15.14",
"@mui/x-data-grid": "^5.17.24",
"@reduxjs/toolkit": "^1.9.7",
"@testing-library/jest-dom": "^5.16.4",
Expand All @@ -16,14 +16,14 @@
"@types/jest": "^26.0.15",
"@types/lodash": "^4.14.202",
"@types/node": "^12.20.55",
"@types/react": "^17.0.69",
"@types/react": "^17.0.80",
"@types/react-dom": "^17.0.25",
"@types/react-redux": "^7.1.31",
"@types/redux-logger": "^3.0.9",
"@types/secure-random-password": "^0.2.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"axios": "^1.6.4",
"axios": "^1.7.4",
"check-password-strength": "^2.0.3",
"commitizen": "^4.3.0",
"cz-conventional-changelog": "^3.3.0",
Expand Down
Loading

0 comments on commit 55303b8

Please sign in to comment.