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.

Sign up for GitHub

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

Jump to bottom

Merge 13.6 code freeze into develop #10729

Merged
merged 3 commits into from
Nov 5, 2019
Merged

Merge 13.6 code freeze into develop #10729

merged 3 commits into from
Nov 5, 2019

Conversation

jkmassel
Copy link
Contributor

@jkmassel jkmassel commented Nov 4, 2019

Merges all changes made as part of the13.6 code freeze into develop.

Does not include release notes – those will be merged into master in a future PR.

To Test:

  • Ensure all tests pass in CI.
  • Ensure version numbers have been updated correctly.
  • Ensure that it makes sense that we've updated translations as part of this change (this change happened during the code freeze – it seems correct, so I've included it here)

@jkmassel jkmassel added the Releases Label related to managing releases label Nov 4, 2019
@jkmassel jkmassel added this to the 13.6 ❄️ milestone Nov 4, 2019
@jkmassel jkmassel requested a review from loremattei November 4, 2019 22:15
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Nov 4, 2019 •
edited
Loading

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

loremattei
loremattei approved these changes Nov 5, 2019
View reviewed changes
Copy link
Contributor

@loremattei loremattei left a comment •
edited
Loading

Choose a reason for hiding this comment

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

As long as the change in the string is not accidental... :shipit:

@jkmassel
Copy link
Contributor Author

jkmassel commented Nov 5, 2019

The change is just encoding > to > which is consistent with usage elsewhere in the strings.xml file, so I'm comfortable merging the change.

@jkmassel jkmassel merged commit 9b930a8 into develop Nov 5, 2019
@jkmassel jkmassel deleted the merge/13.6-into-develop branch November 5, 2019 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@loremattei loremattei loremattei approved these changes

Assignees
No one assigned
Labels
Releases Label related to managing releases
Projects
None yet
Milestone
13.6
Development

Successfully merging this pull request may close these issues.
2 participants
@jkmassel @loremattei