Hannes Papenberg cff87c47e1 Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into release ... # Conflicts: # administrator/components/com_cpanel/Controller/SystemController.php # administrator/components/com_cpanel/Entities/SystemHeader.php # administrator/components/com_cpanel/Entities/SystemItem.php # administrator/components/com_cpanel/Model/SystemModel.php # administrator/components/com_cpanel/View/System/HtmlView.php # administrator/components/com_cpanel/tmpl/system/default.php # administrator/modules/mod_status/tmpl/default.php # administrator/templates/atum/error_login.php # composer.json # composer.lock		2019-03-18 09:16:44 +01:00
..
default.php	Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into release	2019-03-18 09:16:44 +01:00