Merge remote-tracking branch 'origin/main'

# Conflicts:
#	yarn.lock
This commit is contained in:
killian-larcher
2024-11-11 15:00:34 +01:00
24 changed files with 626 additions and 37 deletions
+2 -2
View File
@@ -11,7 +11,7 @@
"dependencies": {
"@auth/prisma-adapter": "^2.4.1",
"@hookform/resolvers": "^3.9.1",
"@prisma/client": "^5.21.1",
"@prisma/client": "^5.22.0",
"@radix-ui/react-accordion": "^1.2.1",
"@radix-ui/react-alert-dialog": "^1.1.2",
"@radix-ui/react-aspect-ratio": "^1.1.0",
@@ -77,7 +77,7 @@
"eslint": "^8",
"eslint-config-next": "15.0.3",
"postcss": "^8",
"prisma": "^5.21.1",
"prisma": "^5.22.0",
"tailwindcss": "^3.4.1",
"typescript": "^5"
},