Benjamin Trenkle 6dc01f5c49 Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev ... # Conflicts: # .drone.yml # administrator/components/com_admin/script.php # administrator/components/com_content/src/Model/ArticleModel.php # administrator/components/com_templates/src/View/Template/HtmlView.php # composer.lock # installation/sql/mysql/base.sql # installation/sql/postgresql/base.sql # layouts/plugins/editors/tinymce/field/tinymcebuilder.php # package-lock.json # package.json # tests/Codeception/api.suite.dist.yml		2021-12-31 16:28:26 +01:00
..
layouts/chromes	[4.0] PHP 8.1 deprecation notices various (#36362)	2021-12-23 09:50:13 +01:00
mod_custom	Copyright format	2020-11-28 20:44:12 +01:00
mod_menu	[4.x] Menu Items with icon only (#34658)	2021-11-09 18:57:25 +01:00
tinymce	[4.0] Fix tinymce template (#33130)	2021-05-07 09:27:26 +02:00