Merge branch 'main' into fix-markdowneditor-overflow

primer · Dec 5, 2022 · 1ca2467 · 1ca2467
2 parents 10e75bf + 0cfdad8
commit 1ca2467
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.changeset/old-lies-boil.md b/.changeset/old-lies-boil.md
diff --git a/.changeset/two-melons-swim.md b/.changeset/two-melons-swim.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @primer/components
 
+## 35.15.1
+
+### Patch Changes
+
+- [#2625](https://github.com/primer/react/pull/2625) [`404e2b15`](https://github.com/primer/react/commit/404e2b15f4fe53e4cbeccb138c0d680beacb3045) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - UnderlineNav2: Use useIsomorphicLayoutEffect to make it SSR friendly
+
+- [#2606](https://github.com/primer/react/pull/2606) [`e98bcdf9`](https://github.com/primer/react/commit/e98bcdf966fea513dc79c73da35e610039aaba3d) Thanks [@radglob](https://github.com/radglob)! - Fix issue where scroll containers nested inside of PageLayout.Pane would be hard to use on mobile.
+
 ## 35.15.0
 
 ### Minor Changes

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/react",
-  "version": "35.15.0",
+  "version": "35.15.1",
   "description": "An implementation of GitHub's Primer Design System using React",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",