Skip to content

Commit

Permalink
Merge branch 'develop' into Branch1
Browse files Browse the repository at this point in the history
  • Loading branch information
AdityaRaimec22 authored May 14, 2024
2 parents 427e18a + d3cbd1e commit 27557ef
Show file tree
Hide file tree
Showing 2 changed files with 144 additions and 53 deletions.
187 changes: 139 additions & 48 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
"@apollo/link-error": "^2.0.0-beta.3",
"@apollo/react-testing": "^4.0.0",
"@dicebear/collection": "^7.1.2",
"@dicebear/core": "^7.0.4",
"@dicebear/core": "^7.1.2",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.8.3",
"@mui/material": "^5.15.15",
"@mui/private-theming": "^5.15.12",
"@mui/system": "^5.14.12",
"@mui/x-charts": "^6.0.0-alpha.13",
"@mui/x-charts": "^7.4.0",
"@mui/x-data-grid": "^6.8.0",
"@mui/x-date-pickers": "^6.6.0",
"@pdfme/generator": "^1.2.6",
"bootstrap": "^5.3.0",
"customize-cra": "^1.0.0",
"dayjs": "^1.10.7",
"flag-icons": "^6.6.6",
"graphql": "^15.5.1",
"graphql": "^16.8.1",
"graphql-tag": "^2.12.6",
"graphql-ws": "^5.16.0",
"history": "^5.3.0",
Expand All @@ -43,7 +43,7 @@
"react-dom": "^17.0.2",
"react-google-recaptcha": "^2.1.0",
"react-i18next": "^11.18.1",
"react-icons": "^4.12.0",
"react-icons": "^5.2.1",
"react-infinite-scroll-component": "^6.1.0",
"react-redux": "^7.2.5",
"react-router-dom": "^6.22.2",
Expand Down

0 comments on commit 27557ef

Please sign in to comment.