Olivier Buisard 50cc339147 Merge branch '4.2-dev' into upmerge-2023-03-11 ... # Conflicts: # administrator/components/com_admin/script.php # administrator/components/com_config/src/Dispatcher/Dispatcher.php # administrator/components/com_config/src/Helper/ConfigHelper.php # administrator/components/com_fields/src/Controller/FieldsController.php # administrator/components/com_fields/src/Controller/GroupsController.php # administrator/language/en-GB/install.xml # administrator/language/en-GB/langmetadata.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # api/language/en-GB/install.xml # api/language/en-GB/langmetadata.xml # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # libraries/src/HTML/HTMLHelper.php # libraries/src/Version.php # plugins/actionlog/joomla/src/Extension/Joomla.php		2023-03-11 16:29:09 -05:00
..
src/Helper	Fixes various code style issues and integrate PHP CS Fixer into drone (#39745)	2023-01-31 11:20:05 +01:00
tmpl	Merge branch '4.2-dev' into upmerge-2023-03-11	2023-03-11 16:29:09 -05:00
mod_finder.php	Fixes various code style issues and integrate PHP CS Fixer into drone (#39745)	2023-01-31 11:20:05 +01:00
mod_finder.xml	Making the encoding consistent- changing lowercase utf to uppercase (#39951)	2023-02-26 20:17:02 -05:00