Fix merge conflicts & update branch #2
Closed
Conversation
This file contains 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
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
add eof and fix a typo
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Misleading alert text (INSTL_DATABASE_PREFIX_MSG)
[4.0] twofactorauth plugins
[4.0] quickicon plugins
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
[4.0] webservice plugins
* rename * Update plg_sampledata_blog.ini * Update plg_sampledata_blog.ini
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
[4.0] Load presets from component directory
Co-Authored-By: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
[4.0] convert com_templates
[staging] missing string in installation #28440
[4.0] actually fix joomlagerman#963
* Update README.md * Update README.md add issue badge
add badge to 3.10-dev branch
* add new structure / file content * add joomla.ini * add install.xml * fix string * add langmetadata.xml
joomlagerman#804 in generally is open
chmst
pushed a commit
that referenced
this pull request
Mar 29, 2024
…an#3101) * add new strings add ; All the following strings are deprecated and will be removed with 6.0 * translation * translation * plg_system_jooa11y.ini aktualisieren Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com> * plg_system_jooa11y.ini aktualisieren Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com> * plg_system_jooa11y.ini aktualisieren Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com> --------- Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix merge conflicts & update branch