docs: fix conflicts

raccoongang · Jun 2, 2022 · 7ebad0b · 7ebad0b
2 parents 08b055b + b5eb9a9
commit 7ebad0b
Show file tree

Hide file tree

Showing 6,300 changed files with 83,287 additions and 939 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [19.25.0](https://github.com/openedx/paragon/compare/v19.24.0...v19.25.0) (2022-05-27)
+
+
+### Features
+
+* [BD-46] add all MUI icons ([#1313](https://github.com/openedx/paragon/issues/1313)) ([404692e](https://github.com/openedx/paragon/commit/404692eef7c7aa140a96bb5272d5f143c44abb72))
+
+# [19.24.0](https://github.com/openedx/paragon/compare/v19.23.1...v19.24.0) (2022-05-27)
+
+
+### Features
+
+* [BD-46] exports useIndexOfLastVisibleChild, responsive tabs ([#1287](https://github.com/openedx/paragon/issues/1287)) ([75311f6](https://github.com/openedx/paragon/commit/75311f69d37f7016b08956f7c63a9194b9c63269))
+
 ## [19.23.1](https://github.com/openedx/paragon/compare/v19.23.0...v19.23.1) (2022-05-20)