Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
AlPha5130 authored Dec 6, 2023
2 parents 4eb95f1 + d11a41c commit 0d4b2d5
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@
"@types/cookie": "^0.6.0",
"@types/js-cookie": "^3.0.6",
"@types/lodash.escaperegexp": "^4.1.9",
"@types/node": "^20.0.0",
"@types/node": "^20.10.3",
"@types/nprogress": "^0.2.3",
"@vercel/node": "^3.0.11",
"@vitejs/plugin-vue": "^4.5.1",
6 changes: 5 additions & 1 deletion pnpm-lock.yaml

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

1 comment on commit 0d4b2d5

@vercel
Copy link

@vercel vercel bot commented on 0d4b2d5 Dec 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.