Merge branch 'main' into fix/blockItemWrapper-z-index

Frontify · Sep 5, 2023 · af4f8c8 · af4f8c8
2 parents ffb0abc + 55cd8e3
commit af4f8c8
Show file tree

Hide file tree

Showing 2 changed files with 316 additions and 3,851 deletions.
diff --git a/packages/guideline-blocks-settings/package.json b/packages/guideline-blocks-settings/package.json
@@ -67,7 +67,7 @@
         "@dnd-kit/modifiers": "^6.0.1",
         "@dnd-kit/sortable": "^7.0.2",
         "@frontify/app-bridge": "workspace:^",
-        "@frontify/fondue": "11.3.0",
+        "@frontify/fondue": "12.0.0-beta.316",
         "@frontify/sidebar-settings": "workspace:^",
         "@react-aria/focus": "^3.14.0",
         "@react-stately/overlays": "^3.6.1",