Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/UA-8347-globe-v2' into f…
Browse files Browse the repository at this point in the history
…eature/UA-8347-globe-v2

# Conflicts:
#	src/Charts.tsx
  • Loading branch information
jmprovencher committed Nov 3, 2023
2 parents 399c9ee + 7f2e9c4 commit 29709f4
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
30 changes: 30 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"lodash": "^4.17.21",
"react": "^18.2.0",
"react-chartjs-2": "^4.3.1",
"react-countup": "^6.5.0",
"react-dom": "^18.2.0",
"react-globe.gl": "^2.22.4",
"react-konami-code": "^2.3.0",
Expand Down

0 comments on commit 29709f4

Please sign in to comment.