Skip to content

Commit 09afe17

Browse files
committed
Merge master into renovate/major-tailwindcss-monorepo and resolve conflicts
2 parents 885278f + b1b59fb commit 09afe17

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
"tailwind-merge": "^3.3.1",
4747
"tailwindcss-animate": "^1.0.7",
4848
"vaul": "^1.1.2",
49-
"zod": "^3.25.76"
49+
"zod": "^4.0.0"
5050
},
5151
"devDependencies": {
52-
"@biomejs/biome": "2.1.1",
52+
"@biomejs/biome": "2.2.3",
5353
"@tailwindcss/postcss": "^4.1.13",
5454
"@types/node": "^24.3.1",
5555
"@types/react": "^19.1.12",
@@ -63,7 +63,7 @@
6363
},
6464
"homepage": "https://tum.dev/",
6565
"name": "tum-dev-website",
66-
"packageManager": "pnpm@10.12.4",
66+
"packageManager": "pnpm@10.15.1",
6767
"pnpm": {
6868
"onlyBuiltDependencies": [
6969
"esbuild",

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)