Olivier Buisard c608616220 Merge branch '4.2-dev' into upmerge-2023-01-20 ... # Conflicts: # administrator/components/com_admin/script.php # administrator/components/com_categories/src/Model/CategoryModel.php # administrator/components/com_config/src/Model/ApplicationModel.php # administrator/components/com_config/src/Model/ComponentModel.php # administrator/components/com_fields/src/Model/FieldModel.php # administrator/components/com_fields/src/Model/GroupModel.php # administrator/components/com_finder/src/Indexer/Query.php # administrator/components/com_finder/src/Service/HTML/Filter.php # administrator/components/com_finder/src/Service/HTML/Query.php # administrator/components/com_joomlaupdate/src/Model/UpdateModel.php # administrator/components/com_languages/src/Model/StringsModel.php # administrator/components/com_menus/tmpl/items/modal.php # administrator/components/com_tags/src/Table/TagTable.php # administrator/components/com_users/src/Model/LevelsModel.php # administrator/components/com_users/src/Model/MailModel.php # administrator/components/com_users/src/Model/UserModel.php # administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php # components/com_config/src/Controller/ConfigController.php # components/com_content/src/Model/ArchiveModel.php # components/com_finder/src/Controller/SuggestionsController.php # components/com_tags/src/Model/TagModel.php # components/com_tags/src/Service/Router.php # components/com_tags/src/View/Tag/FeedView.php # components/com_tags/src/View/Tag/HtmlView.php # components/com_users/src/Controller/ProfileController.php # components/com_users/src/Controller/UserController.php # composer.lock # installation/src/Model/SetupModel.php # layouts/joomla/form/field/text.php # libraries/namespacemap.php # libraries/src/Component/Router/Rules/NomenuRules.php # libraries/src/Form/Field/TextField.php # libraries/src/Helper/ModuleHelper.php # libraries/src/MVC/Model/ListModel.php # libraries/src/Object/CMSObject.php # libraries/src/Table/ContentType.php # plugins/authentication/cookie/src/Extension/Cookie.php # plugins/behaviour/versionable/src/Extension/Versionable.php # plugins/editors/tinymce/src/Field/TinymcebuilderField.php # plugins/extension/namespacemap/src/Extension/NamespaceMap.php # plugins/quickicon/extensionupdate/src/Extension/Extensionupdate.php # plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php # plugins/quickicon/privacycheck/privacycheck.php # plugins/user/joomla/joomla.php		2023-01-20 20:32:33 -05:00
..
TagsSimilarHelper.php	Merge branch '4.2-dev' into upmerge-2023-01-20	2023-01-20 20:32:33 -05:00