Skip to content

Commit

Permalink
Merge pull request #778 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Razzmatazzz authored Dec 10, 2023
2 parents f262ee7 + fcb49ec commit 11aac0c
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 58 deletions.
141 changes: 86 additions & 55 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
},
"dependencies": {
"@emotion/styled": "^11.11.0",
"@fortawesome/fontawesome-free": "^6.4.2",
"@fortawesome/fontawesome-free": "^6.5.1",
"@mdi/js": "^6.9.96",
"@mdi/react": "^1.6.1",
"@mui/lab": "^5.0.0-alpha.153",
"@mui/lab": "^5.0.0-alpha.154",
"@mui/material": "^5.14.18",
"@reduxjs/toolkit": "^1.9.7",
"@testing-library/jest-dom": "^5.17.0",
Expand All @@ -47,7 +47,7 @@
"leaflet-fullscreen": "^1.0.2",
"leaflet.awesome-markers": "2.0.5",
"lodash.debounce": "^4.0.8",
"rc-slider": "^10.4.0",
"rc-slider": "^10.5.0",
"react": "^18.2.0",
"react-cookie-consent": "^9.0.0",
"react-countdown": "^2.3.5",
Expand Down

0 comments on commit 11aac0c

Please sign in to comment.