Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.0] Upmerge 4.4 #2881

Merged
merged 36 commits into from Jul 30, 2023
Merged

Conversation

heelc29
Copy link
Member

@heelc29 heelc29 commented Jul 30, 2023

Vorbereitung für #2872

tecpromotion and others added 30 commits April 18, 2023 11:26
Duplicate line deleted.
[4.3] Template style assigned text plurals
tecpromotion and others added 5 commits July 12, 2023 20:58
* 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>
@heelc29 heelc29 added this to the 5.0.0v1 milestone Jul 30, 2023
@heelc29 heelc29 requested review from a team, tecpromotion and zero-24 and removed request for a team July 30, 2023 14:37
@tecpromotion tecpromotion merged commit 2fc5901 into joomlagerman:5.0-dev Jul 30, 2023
@heelc29 heelc29 deleted the 5.0/upmerge-20230730 branch July 30, 2023 14:42
@heelc29 heelc29 mentioned this pull request Jul 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

2 participants