Skip to content

Commit

Permalink
Merge branch 'master' into feat/monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
amattu2 committed Nov 3, 2024
2 parents 6896ce9 + bd3c4ec commit f3a6519
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 33 deletions.
60 changes: 31 additions & 29 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 packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": false,
"dependencies": {
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.16.7",
"@mui/lab": "^5.0.0-alpha.173",
"@mui/material": "^5.16.0",
Expand All @@ -18,7 +18,7 @@
"papaparse": "^5.4.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.53.0",
"react-hook-form": "^7.53.1",
"react-router-dom": "^6.25.1",
"react-scripts": "^5.0.1",
"react-spreadsheet": "^0.9.5",
Expand Down Expand Up @@ -65,8 +65,8 @@
"@types/lodash": "^4.17.7",
"@types/node": "^20.16.10",
"@types/numeral": "^2.0.5",
"@types/papaparse": "^5.3.14",
"@types/react": "^18.2.25",
"@types/papaparse": "^5.3.15",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.2.7",
"@types/react-transition-group": "^4.4.7",
"@types/react-virtualized-auto-sizer": "^1.0.4",
Expand Down

0 comments on commit f3a6519

Please sign in to comment.