Merge 14.7 code freeze to develop #11714
Merged
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
…sert_captions_for_media_library Revert "Update media insertion to send caption information."
Reverting the initial revert that was applied to the release branch because we want the change to remain on develop and this will insure that change is left when the release branch is merged back to develop. This reverts commit d30b6d0.
|
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
|
You can test the changes on this Pull Request by downloading the APK here. |
…eeze-to-develop-2
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.
Aside from usual code freeze commits, we have merged #11706 into the
release/14.7branch to revert a change that shouldn't have been included in14.7and then in this branch reverted that revert in dbef167. So, even though there are extra commits, this PR looks exactly like a regular code freeze merge, which was the goal.cc @cameronvoell @mchowning