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
..
app.php	[4.0] Remove reference to old JPrefixed Class + Cleanup (Misc) (#36442)	2021-12-30 22:48:10 +00:00
defines.php	[4.0] Converted copyright statement to standard format (#31504)	2020-11-28 01:33:45 +00:00
framework.php	[4.1] Log deprecated only when explicitly requested (#31143)	2021-08-20 14:51:39 +02:00
index.html	Adding back some index.html files.	2014-12-11 09:01:10 +01:00