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 release 1.70.1 to develop #4540

Merged
merged 13 commits into from
Feb 3, 2022
Merged

Conversation

dcalhoun
Copy link
Member

@dcalhoun dcalhoun commented Feb 2, 2022

This PR incorporates the changes from the 1.70.1 release into develop.

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.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Feb 2, 2022

Wanna run full suite of Android and iOS UI tests? Click here and 'Approve' CI job!

Copy link
Contributor

@mchowning mchowning left a comment

Choose a reason for hiding this comment

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

LGTM! 👍

mokagio added a commit to wordpress-mobile/WordPress-iOS that referenced this pull request Feb 3, 2022
Conflicts on `Podfile` and `Podfile.lock` because of the Gutenberg
hotfix (1.70.1) in the release branch. I resolved them by keeping the `trunk`
version (1.71.0-alpha2) because it's the latest, even though it doesn't
yet include the hotfix. It will soon, though:
wordpress-mobile/gutenberg-mobile#4540
@SiobhyB
Copy link
Contributor

SiobhyB commented Feb 3, 2022

I'm going to go ahead to merge as we've confirmed the Gutenberg reference is 387e4679e38672dd35e0bf5f9650d0af618a2192, the same as the merge commit in WordPress/gutenberg#38276. 👍

@SiobhyB SiobhyB merged commit 35b462f into develop Feb 3, 2022
@SiobhyB SiobhyB deleted the merge_release_1.70.1_to_develop branch February 3, 2022 08:08
@fluiddot
Copy link
Contributor

fluiddot commented Feb 3, 2022

The PR looks great to me 🎊 !

I'm going to go ahead to merge as we've confirmed the Gutenberg reference is 387e4679e38672dd35e0bf5f9650d0af618a2192, the same as the merge commit in WordPress/gutenberg#38276. 👍

Thanks @SiobhyB for merging it 🙇 .

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.

4 participants