chore(merge): resolve v2 conflicts

This commit is contained in:
Thomas Camlong committed 2026-07-15 12:09:51 +02:00
commit 377f2f6a20
58 files changed
+23862 -11114

No files matched your search

+3
View File
@@ -21,6 +21,9 @@
"db:studio": "pnpm -F db studio",
"dev": "pnpm -F nextjs dev",
"dev:docs": "pnpm -F @homarr/docs dev",
"dev:workshop": "docker compose -f ./apps/workshop/docker-compose.yml up --build",
"test:workshop-image": "bash ./apps/workshop/scripts/smoke-test.sh",
"ci:act:workshop": "bash ./scripts/ci/workshop-act.sh",
"docker:dev": "docker compose -f ./development/development.docker-compose.yml up",
"format": "turbo format --continue -- --check",
"format:fix": "turbo format --continue",