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 14.2 release into master (includes release notes changes) #11322

Merged
merged 213 commits into from
Feb 14, 2020

Conversation

oguzkocer
Copy link
Contributor

This PR merges release/14.2 branch into master. There were 2 conflicts before the merge and both of them were related to the release notes. For both conflicts the release/14.2 version was accepted. (with a minor modification for removing an extra line)

Conflicted files:

WordPress/metadata/PlayStoreStrings.po
WordPress/metadata/release_notes.txt

cameronvoell and others added 22 commits February 7, 2020 15:12
…elease_1.22.0

 Gutenberg: update to v1.22.0
…ils_cleanup

Issue/10698 encryption utils cleanup
…notes-14.2

Updates release notes for 14.2 after editorial review
@oguzkocer oguzkocer added the Releases Label related to managing releases label Feb 14, 2020
@oguzkocer oguzkocer added this to the 14.2 ❄️ milestone Feb 14, 2020
@oguzkocer oguzkocer requested a review from jkmassel February 14, 2020 19:54
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Feb 14, 2020

You can test the changes on this Pull Request by downloading the APK here.

@jkmassel jkmassel merged commit 8921c1d into master Feb 14, 2020
@jkmassel jkmassel deleted the merge/release-14.2-to-master branch February 14, 2020 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.