Merge branch 'next' of https://github.com/signalco-io/signalco into next

signalco-io · Dec 26, 2024 · 4b77fbe · 4b77fbe
2 parents 0f67a9f + 73a307c
commit 4b77fbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/web/packages/ui-primitives/package.json b/web/packages/ui-primitives/package.json
@@ -52,7 +52,7 @@
         "react-dom": "19.0.0",
         "react-timeago": "7.2.0",
         "sass": "1.83.0",
-        "tailwind-merge": "2.5.5",
+        "tailwind-merge": "2.6.0",
         "tailwindcss": "3.4.17",
         "tailwindcss-animate": "1.0.7",
         "tsup": "8.3.5",

diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml