Merge beta 21.9.0.2 #20321
Merged
Merge beta 21.9.0.2 #20321
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sRemovalCoordinator`
…audio-block-upload [Gutenberg] Allow audio upload to premium users after Jetpack features removal
…rdinator-deadlock Fix deadlock that can occur when initializing `RootViewCoordinator`
As expected when merging the current release branch into an hotfix branch from the previous version, we got conflicts on the `config/Version.*.xcconfig` files. As usual, I resolved them with `git checkout --theirs`, keeping the value from the release branch. There were also conflicts in `WordPress/Classes/System/WordPressAppDelegate.swift`. Those were solved by keeping the version from the hotfix.
…resh Blaze: update blaze status on pull to refresh
…eral-section Blaze: Show Blaze in general section
You can test the changes in WordPress from this Pull Request by:
|
You can test the changes in Jetpack from this Pull Request by:
|
crazytonyli
approved these changes
Mar 15, 2023
This was referenced Mar 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes:
RootViewCoordinatorby @hassaanelgaremRelease checks
.stringsand Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress.xcconfig