Feeling Lucky
Language Change
PR-6.0-dev
[#45114] - [6.0] Upmerges - 2025-03-12
- Fixed in Code Base
- 12 Mar 2025
- Medium
- Build: 6.0-dev
- # 45114
- Diff
- Bodge-IT:upmerges/2025-03-12
User tests: Successful: Unsuccessful:
/administrator/components/com_templates/src/model/StyleModel.php had multiple changes, multiple sources and needed manual merging.
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Administration com_config com_contact com_joomlaupdate com_media com_messages com_newsfeeds com_templates com_users Language & Strings JavaScript Repository Front End com_content com_contenthistory com_fields com_modules |
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2025-03-12 14:53:42 |
| Closed_By | ⇒ | Bodge-IT | |
| Labels |
Added:
Language Change
PR-6.0-dev
|
||
richard67
- comment
- 12 Mar 2025
I've reset the 6.0-dev branch to the previous state before this PR was merged, which was possible as after this PR no other one was merged into 6.0-dev.
This PR was wrong as it obviously was created by merging the 5.4-dev branch into the branch for this PR with a squash commit, so this PR has only one commit, see https://github.com/joomla/joomla-cms/pull/45114/commits , and so the commit history of the lower branches since the previous upmerge gets lost.