Merge branch 'dev' into search-page-alerts

weareinreach · Jun 10, 2024 · 767f42a · 767f42a
2 parents bd277b1 + 454725b
commit 767f42a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -142,7 +142,7 @@
 		"i18next-intervalplural-postprocessor": "3.0.0",
 		"luxon": "3.4.4",
 		"mantine-react-table": "1.3.4",
-		"merge-anything": "5.1.7",
+		"merge-anything": "6.0.2",
 		"msw": "2.3.1",
 		"msw-storybook-addon": "2.0.2",
 		"next": "14.2.3",

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