Skip to content

Commit 73bcf6f

Browse files
committed
Merge branch 'main' into tests-e2e
# Conflicts: # client/package-lock.json
2 parents bf2f2a2 + cb9481c commit 73bcf6f

52 files changed

Lines changed: 9152 additions & 1277 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

client/package-lock.json

Lines changed: 51 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@pinia/testing": "^1.0.2",
4343
"@vuepic/vue-datepicker": "^11.0.1",
4444
"@vueuse/core": "^10.9.0",
45-
"axios": "^1.6.8",
45+
"axios": "1.13.2",
4646
"chart.js": "^4.4.8",
4747
"core-js": "^3.37.1",
4848
"date-fns-tz": "^3.1.3",

0 commit comments

Comments
 (0)