Skip to content

Commit

Permalink
Merge pull request #748 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Shebuka authored Nov 14, 2023
2 parents 25e2ea3 + 4a94643 commit aee2a8e
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 91 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
with:
ref: ${{ steps.branch-deploy.outputs.ref }}

- uses: actions/setup-node@v3.8.1
- uses: actions/setup-node@v4.0.0
if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
with:
node-version-file: .node-version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
comment: "true"

- uses: actions/setup-node@v3.8.1
- uses: actions/setup-node@v4.0.0
with:
node-version-file: .node-version
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
uses: GrantBirki/[email protected]

- uses: actions/setup-node@v3.8.1
- uses: actions/setup-node@v4.0.0
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
with:
node-version-file: .node-version
Expand Down
169 changes: 85 additions & 84 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 @@ -26,7 +26,7 @@
"@fortawesome/fontawesome-free": "^6.4.2",
"@mdi/js": "^6.9.96",
"@mdi/react": "^1.6.1",
"@mui/lab": "^5.0.0-alpha.150",
"@mui/lab": "^5.0.0-alpha.152",
"@mui/material": "^5.14.15",
"@reduxjs/toolkit": "^1.9.7",
"@testing-library/jest-dom": "^5.17.0",
Expand All @@ -40,14 +40,14 @@
"framer-motion": "^10.16.0",
"fuse.js": "^7.0.0",
"i18next": "^23.6.0",
"i18next-browser-languagedetector": "^7.1.0",
"i18next-browser-languagedetector": "^7.2.0",
"i18next-http-backend": "^2.3.1",
"intersection-observer": "^0.12.2",
"leaflet": "^1.9.4",
"leaflet-fullscreen": "^1.0.2",
"leaflet.awesome-markers": "2.0.5",
"lodash.debounce": "^4.0.8",
"rc-slider": "^10.3.1",
"rc-slider": "^10.4.0",
"react": "^18.2.0",
"react-cookie-consent": "^9.0.0",
"react-countdown": "^2.3.5",
Expand All @@ -60,7 +60,7 @@
"react-loader-spinner": "^5.4.5",
"react-query": "^3.39.3",
"react-redux": "^8.1.3",
"react-router-dom": "^6.17.0",
"react-router-dom": "^6.18.0",
"react-router-hash-link": "^2.4.3",
"react-scripts": "^5.0.1",
"react-select": "^5.7.7",
Expand Down

0 comments on commit aee2a8e

Please sign in to comment.