Benjamin Trenkle 4ab05bbd83 Merge branch '4.0-dev' of github.com:joomla/joomla-cms into release ... # Conflicts: # administrator/components/com_fields/forms/field.xml # administrator/components/com_menus/forms/item_component.xml # administrator/components/com_menus/forms/itemadmin_heading.xml		2019-07-17 23:15:06 +02:00
..
mysql	Merge branch '4.0-dev' of github.com:joomla/joomla-cms into release	2019-07-17 23:15:06 +02:00
postgresql	Merge branch '4.0-dev' of github.com:joomla/joomla-cms into release	2019-07-17 23:15:06 +02:00