Skip to content

Commit

Permalink
Merge pull request #270 from etherisc/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
doerfli authored Dec 31, 2024
2 parents b695d43 + 066a13c commit fe68f06
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 43 deletions.
79 changes: 40 additions & 39 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 @@ -20,13 +20,13 @@
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@fontsource/poppins": "^5.1.1",
"@fontsource/roboto": "^5.0.8",
"@fontsource/roboto": "^5.1.1",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.1",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mui/material": "^6.3.0",
"@mui/x-data-grid": "^7.23.2",
"@mui/x-data-grid": "^7.23.5",
"@mui/x-date-pickers": "^7.23.3",
"@react-hooks-hub/use-debounce": "^1.1.5",
"@reduxjs/toolkit": "^2.5.0",
Expand All @@ -47,7 +47,7 @@
"nextjs-google-analytics": "^2.3.3",
"react": "^18.3.0",
"react-dom": "^18.3.0",
"react-hook-form": "^7.54.1",
"react-hook-form": "^7.54.2",
"react-i18next": "^15.4.0",
"react-redux": "^9.2.0",
"react-swipeable": "^7.0.2",
Expand Down

0 comments on commit fe68f06

Please sign in to comment.