[6.0] Upmerges - 2025-04-02#45268
Merged
Bodge-IT merged 22 commits intojoomla:6.0-devfrom Apr 2, 2025
Merged
Conversation
…3-26 [5.4] Upmerge changes from 5.3-dev 2025-03-26
Co-authored-by: Tuan Pham Ngoc <github@joomdonation.com>
…4-01 [5.4] Upmerge changes from 5.3-dev 2025-04-01
|
Please add more information to your issue. Without test instructions and/or any description we will close this issue within 4 weeks. Thanks. |
richard67
requested changes
Apr 2, 2025
Member
richard67
left a comment
richard67
left a comment
There was a problem hiding this comment.
@Bodge-IT Please revert the changes in script.php, i.e. use the version from the 6.0-dev branch.
Have you had a merge conflict with that file? IF yes, then you should have resolved it by using the file from your branch and ignore the changes from 5.4-dev.
brianteeman
reviewed
Apr 2, 2025
richard67
reviewed
Apr 2, 2025
Removed unnecessary section
Member
Contributor
Author
|
Thanks @brianteeman and @richard67 for reviews and guidance. |
richard67
approved these changes
Apr 2, 2025
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
11 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.
No description provided.