29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-28 08:03:40 +00:00
cms/templates/cassiopeia/html
Benjamin Trenkle 39807a496d
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts:
#	.drone.yml
#	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
2021-12-18 15:27:04 +01:00
..
layouts/chromes Fix htmlspecialchars requires a string not null 2021-12-11 20:05:50 +00: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