Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/snyk-upgrade-e87624b9688aa5be945…
Browse files Browse the repository at this point in the history
…b85d138ac4c4a'

# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
dariosalvi78 committed Jun 17, 2024
2 parents bf77f3c + 3261a0c commit 32180df
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"@quasar/extras": "^1.16.11",
"axios": "^1.7.2",
"chart.js": "^4.4.2",
"chart.js": "^4.4.3",
"chartjs-adapter-date-fns": "^3.0.0",
"chartjs-plugin-zoom": "^2.0.1",
"core-js": "^3.37.1",
Expand Down

0 comments on commit 32180df

Please sign in to comment.