Skip to content

Commit

Permalink
fix incorrect changelog entries (#11761)
Browse files Browse the repository at this point in the history
## Description
<!-- Please describe what you have changed or added -->

I merged #11649 to master but the changelog entries ended up getting merged to the wrong section.
  • Loading branch information
nerrad authored Nov 12, 2018
1 parent 0c734e1 commit 7bbde1c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
8 changes: 4 additions & 4 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## 6.0.1 (Unreleased)

### Polish

- Remove `<DateTimePicker />` obsolete `locale` prop (and pass-through to child components) and obsolete `is12Hour` prop pass through to `<DateTime />` [#11649](https://github.com/WordPress/gutenberg/pull/11649)

### Bug Fixes

- Avoid constantly recomputing the popover position.
Expand All @@ -14,10 +18,6 @@

## 5.1.0 (2018-11-09)

### Polish

- Remove `<DateTimePicker />` obsolete `locale` prop (and pass-through to child components) and obsolete `is12Hour` prop pass through to `<DateTime />` [#11649](https://github.com/WordPress/gutenberg/pull/11649)

### New Feature

- Adjust a11y roles for MenuItem component, so that aria-checked is used properly, related change in Editor/Components/BlockNavigationList ([#11431](https://github.com/WordPress/gutenberg/issues/11431)).
Expand Down
9 changes: 5 additions & 4 deletions packages/editor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## 7.0.1 (Unreleased)

### Polish

- Remove unnecessary `locale` prop usage [#11649](https://github.com/WordPress/gutenberg/pull/11649)


### Bug Fixes

- Fix multi-selection triggering too often when using floated blocks.
Expand Down Expand Up @@ -34,10 +39,6 @@

## 6.2.0 (2018-11-09)

### Polish

- Remove unnecessary `locale` prop usage [#11649](https://github.com/WordPress/gutenberg/pull/11649)

### New Features

- Adjust a11y roles for menu items, and make sure screen readers can properly use BlockNavigationList ([#11431](https://github.com/WordPress/gutenberg/issues/11431)).
Expand Down

0 comments on commit 7bbde1c

Please sign in to comment.