Merge branch 'main' into feat/zoom-buttons

gitify-app · Jul 8, 2024 · ac28071 · ac28071
2 parents 1228182 + 8ebb036
commit ac28071
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -114,7 +114,7 @@
     "react-dom": "18.3.1",
     "react-final-form": "6.5.9",
     "react-router-dom": "6.24.1",
-    "tailwind-merge": "2.3.0",
+    "tailwind-merge": "2.4.0",
     "ts-loader": "9.5.1",
     "typescript": "5.5.3"
   },
@@ -148,7 +148,7 @@
     "webpack-cli": "5.1.4",
     "webpack-merge": "6.0.1"
   },
-  "packageManager": "pnpm@9.4.0",
+  "packageManager": "pnpm@9.5.0",
   "lint-staged": {
     "*.{js,json,ts,tsx}": "biome format --fix"
   }

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