Olivier Buisard 450c8aeba8 Merge branch '4.2-dev' into upmerge-2022-09-03 ... # Conflicts: # .gitignore # 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/Version.php		2022-09-03 22:02:12 -04:00
..
com_media.ini	[4.1] Media webservice (#35788)	2021-11-23 20:20:07 +01:00
install.xml	Reset to dev	2022-09-02 21:48:45 +02:00
joomla.ini	Use ellipsis - part 1 (#38638)	2022-08-31 22:34:04 +02:00
langmetadata.xml	Reset to dev	2022-09-02 21:48:45 +02:00