Skip to content

Master to develop post release v1.28.0#2269

Merged
mchowning merged 16 commits intodevelopfrom
master-to-develop-post-release-v1.28.0
May 18, 2020
Merged

Master to develop post release v1.28.0#2269
mchowning merged 16 commits intodevelopfrom
master-to-develop-post-release-v1.28.0

Conversation

@mchowning
Copy link
Contributor

@mchowning mchowning commented May 16, 2020

Merge master to develop following the 1.28.0 release. Had to create a branch off of master in order to resolve the Gutenberg submodule ref conflict, which I resolved in favor of develop. We will probably need to merge this in order to build WPAndroid's develop branch against the gb-mobile's develop branch once all the no-jitpack changes are merged into WPAndroid.

PR submission checklist:

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

Copy link
Contributor

@SergioEstevao SergioEstevao left a comment

Choose a reason for hiding this comment

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

Working great!

@mchowning mchowning merged commit 26fdb56 into develop May 18, 2020
@mchowning mchowning deleted the master-to-develop-post-release-v1.28.0 branch May 18, 2020 13:54
@SergioEstevao SergioEstevao modified the milestones: 1.29, 1.28 May 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants