Ingo Schommer afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss
2013-08-07 17:14:47 +02:00
..
2012-10-30 18:59:26 +01:00
2013-04-18 19:28:13 +02:00
2012-11-16 14:45:20 +13:00
2011-10-18 15:32:52 -07:00
2011-10-18 15:32:52 -07:00
2011-10-18 11:54:45 +02:00
2012-01-31 17:04:59 +01:00
2012-10-30 17:00:41 +01:00
2012-10-30 17:00:41 +01:00
2012-10-30 17:00:41 +01:00
2013-02-18 01:03:57 +01:00
2012-07-31 16:42:40 +12:00
2012-11-26 11:20:21 +13:00
2013-02-18 01:34:51 +01:00
2013-02-20 00:39:00 +01:00