Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.43.0 release back to the development branch #2909

Merged
merged 18 commits into from
Dec 23, 2020
Merged

Merge 1.43.0 release back to the development branch #2909

merged 18 commits into from
Dec 23, 2020

Conversation

guarani
Copy link
Contributor

@guarani guarani commented Dec 16, 2020

Brings back changes from 1.43.0 release to develop

Release PR 1.43.0 for reference: #2874

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

@guarani guarani requested a review from cameronvoell December 16, 2020 17:52
@hypest
Copy link
Contributor

hypest commented Dec 21, 2020

👋 @guarani , let's rephrase the PR title to have a longer description of what this PR does, similar to the other PR you recently opened, thanks!

@guarani guarani changed the title Trunk Merge 1.43.0 release back to the development branch Dec 21, 2020
Copy link
Contributor

@cameronvoell cameronvoell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be good to go once we resolve conflicts. We can resolve the gutenberg ref conflict by just pointing to the release merge on gutenberg master since it was merged here: WordPress/gutenberg@a454634

@guarani
Copy link
Contributor Author

guarani commented Dec 23, 2020

This should be good to go once we resolve conflicts. We can resolve the gutenberg ref conflict by just pointing to the release merge on gutenberg master since it was merged here: WordPress/gutenberg@a454634

I've created the #2929 PR to replace this one, since there's multiple conflicts here.

@guarani guarani merged commit 5c767f2 into develop Dec 23, 2020
@guarani guarani added this to the 1.44 (16.5) milestone Jan 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants