[5.0] Upmerge 4.4#2881
Merged
tecpromotion merged 36 commits intojoomlagerman:5.0-devfrom Jul 30, 2023
Merged
Conversation
Duplicate line deleted.
[4.3] fix translation help screen
Securitypatch 432
[4.3] Template style assigned text plurals
…xt definitions (joomlagerman#2854) * add two new files * fix joomlagerman#2849 * fix joomlagerman#2855 * fix
* fix joomlagerman#2848 * fix Sicherheitstoken * Update administrator/language/de-DE/lib_joomla.ini Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de> * Update installation/language/de-DE/joomla.ini Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de> * Update language/de-DE/lib_joomla.ini Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de> * Update administrator/language/de-DE/joomla.ini Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com> * fix wording thanks @zero-24 --------- Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
[4.4] Upmerge 4.3
heelc29
requested review from
a team,
tecpromotion and
zero-24
and removed request for
a team
tecpromotion
approved these changes
Jul 30, 2023
Merged
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
2 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.
Vorbereitung für #2872