Skip to content

Commit

Permalink
Merge pull request #789 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Shebuka authored Dec 13, 2023
2 parents 28496b0 + 4d14302 commit 70911dc
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 38 deletions.
74 changes: 40 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"prettier": "^3.1.0"
"prettier": "^3.1.1"
},
"dependencies": {
"@emotion/styled": "^11.11.0",
Expand All @@ -28,7 +28,7 @@
"@mdi/react": "^1.6.1",
"@mui/lab": "^5.0.0-alpha.154",
"@mui/material": "^5.14.19",
"@reduxjs/toolkit": "^1.9.7",
"@reduxjs/toolkit": "^2.0.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.1.2",
"@tippyjs/react": "^4.2.6",
Expand All @@ -39,7 +39,7 @@
"fast-deep-equal": "^3.1.3",
"framer-motion": "^10.16.0",
"fuse.js": "^7.0.0",
"i18next": "^23.7.6",
"i18next": "^23.7.9",
"i18next-browser-languagedetector": "^7.2.0",
"i18next-http-backend": "^2.4.2",
"intersection-observer": "^0.12.2",
Expand All @@ -57,7 +57,7 @@
"react-hotkeys-hook": "^4.4.1",
"react-i18next": "^13.5.0",
"react-intersection-observer": "^9.5.3",
"react-loader-spinner": "^5.4.5",
"react-loader-spinner": "^6.1.0",
"react-query": "^3.39.3",
"react-redux": "^8.1.3",
"react-router-dom": "^6.20.0",
Expand Down

0 comments on commit 70911dc

Please sign in to comment.