Merged
Conversation
Signed-off-by: BrianTeeman <brian@teeman.net>
Co-authored-by: Harald Leithner <leithner@itronic.at>
…-08-12 10 files with version/date conflicts merged with `git checkout --ours .`
joomla-cms-bot
added
NPM Resource Changed
Member
|
Thanks. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Summary of Changes
This pull request (PR) merges the changes from 5.3-dev up into 5.4-dev which have been made since the last upmerge PR #45845 from 5 August, one week ago.
There were 5 real PRs from 5.3-dev merged.
10 files with version/date conflicts merged with
git checkout --ours .Testing Instructions
Review. Check the commits of this PR and those in the 5.3-dev branch.
Actual result BEFORE applying this Pull Request
5.4-dev branch is not up to date with 5.3-dev.
Expected result AFTER applying this Pull Request
5.4-dev branch is up to date with 5.3-dev.
Link to documentations
Please select:
Documentation link for docs.joomla.org:
No documentation changes for docs.joomla.org needed
Pull Request link for manual.joomla.org:
No documentation changes for manual.joomla.org needed