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 22.2 final to trunk #18339

Merged
merged 7 commits into from
Apr 30, 2023
Merged

Merge 22.2 final to trunk #18339

merged 7 commits into from
Apr 30, 2023

Conversation

oguzkocer
Copy link
Contributor

Includes changes from #18332.

There was a merge conflict in WordPress/src/main/res/values-de/strings.xml due to the updated string value site_creation_domain_cost. Similar to the previous PRs, I've removed this translation because it's no longer correct as the number of arguments for the string has changed.

@oguzkocer oguzkocer added the Releases Label related to managing releases label Apr 28, 2023
@oguzkocer oguzkocer added this to the 22.3 milestone Apr 28, 2023
@wpmobilebot
Copy link
Contributor

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr18339-260c3cc
Commit260c3cc
Direct Downloadjetpack-prototype-build-pr18339-260c3cc.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr18339-260c3cc
Commit260c3cc
Direct Downloadwordpress-prototype-build-pr18339-260c3cc.apk
Note: Google Login is not supported on these builds.

@oguzkocer oguzkocer marked this pull request as ready for review April 28, 2023 18:32
@oguzkocer oguzkocer requested a review from a team April 28, 2023 18:32
@oguzkocer oguzkocer enabled auto-merge April 28, 2023 18:32
Copy link
Contributor

@mokagio mokagio left a comment

Choose a reason for hiding this comment

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

  • versionName dropping the rc suffix and versionCode bump in version.properties
  • strings.xml updates
  • release_notes.xml and changelogs/*.txt updates

@oguzkocer oguzkocer merged commit 096af9b into trunk Apr 30, 2023
@oguzkocer oguzkocer deleted the merge/22.2-final-to-trunk branch April 30, 2023 10:58
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.

4 participants