Manually sync patch-3.x.x -> dev-patch (3.6.0) (#1153)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Michael Murray <[email protected]> Co-authored-by: github-bot <[email protected]> Co-authored-by: ccedrone <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katie Weinstein <[email protected]> Co-authored-by: Katie Weinstein <[email protected]> Co-authored-by: Chris Cedrone <[email protected]> Co-authored-by: Orion Johnson <[email protected]> Co-authored-by: noahwebs <[email protected]> Co-authored-by: Jerrod Heiser <[email protected]>
cengage · Oct 26, 2023 · c192e06 · c192e06 · github-actions · Oct 26, 2023
1 parent 8457269
commit c192e06
Show file tree

Hide file tree

Showing 42 changed files with 38,317 additions and 86,668 deletions.
diff --git a/.changeset/cuddly-dolphins-yell.md b/.changeset/cuddly-dolphins-yell.md
@@ -0,0 +1,5 @@
+---
+"react-magma-docs": patch
+---
+
+build: Resolve merge conflicts when pulling main -> dev
diff --git a/.changeset/docs-typos.md b/.changeset/docs-typos.md
diff --git a/.changeset/dropdown-menuItemRole.md b/.changeset/dropdown-menuItemRole.md
diff --git a/.changeset/dropdown-noitems.md b/.changeset/dropdown-noitems.md
diff --git a/.changeset/dropdownContent-falseChild.md b/.changeset/dropdownContent-falseChild.md
diff --git a/.changeset/feat-dropdownExpandableMenu.md b/.changeset/feat-dropdownExpandableMenu.md
diff --git a/.changeset/feat-optionalPerPageSelect.md b/.changeset/feat-optionalPerPageSelect.md
diff --git a/.changeset/fix-datePickerEscape.md b/.changeset/fix-datePickerEscape.md
diff --git a/.changeset/fix-dropdownDocsStorybook.md b/.changeset/fix-dropdownDocsStorybook.md
diff --git a/.changeset/fix-expandableDropdown.md b/.changeset/fix-expandableDropdown.md
diff --git a/.changeset/fix-expandableDropdownDisabled.md b/.changeset/fix-expandableDropdownDisabled.md
diff --git a/.changeset/fix-inputBase.md b/.changeset/fix-inputBase.md
diff --git a/.changeset/fix-labelsColors.md b/.changeset/fix-labelsColors.md
diff --git a/.changeset/fix-modalEscape.md b/.changeset/fix-modalEscape.md
diff --git a/.changeset/fix-passInputLarge.md b/.changeset/fix-passInputLarge.md
diff --git a/.changeset/fix-radioGroup.md b/.changeset/fix-radioGroup.md
diff --git a/.changeset/fix-subPageTabs b/.changeset/fix-subPageTabs
diff --git a/.changeset/inputHeight.md b/.changeset/inputHeight.md
diff --git a/.changeset/maxLength-warnings.md b/.changeset/maxLength-warnings.md
diff --git a/.changeset/nativeSelectHeight.md b/.changeset/nativeSelectHeight.md
diff --git a/.changeset/pre.json b/.changeset/pre.json
diff --git a/.changeset/sortArrows.md b/.changeset/sortArrows.md
diff --git a/.changeset/tabprops.md b/.changeset/tabprops.md
diff --git a/.changeset/update-changelog.md b/.changeset/update-changelog.md
diff --git a/.changeset/update-modalPadding.md b/.changeset/update-modalPadding.md