Dan Hensby c5c8a6a720 Merge remote-tracking branch '3.2' into 3 ... Conflicts: admin/templates/Includes/ModelAdmin_ImportSpec.ss css/GridField.css		2015-08-17 11:59:24 +00:00
..
AdminRootController.php	Update docblocks	2013-10-15 11:29:58 +13:00
CMSBatchAction.php	API Deprecate delete in favour of archive	2015-06-03 14:24:27 +12:00
CMSBatchActionHandler.php	BUG Fix regressions in changes to batch action feature	2015-06-23 16:28:25 +12:00
CMSForm.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
CMSMenu.php	Convert FQCNs to html safe strings	2015-07-15 15:33:00 +01:00
CMSMenuItem.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
CMSPreviewable.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
CMSProfileController.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GroupImportForm.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
LeftAndMain.php	Merge remote-tracking branch '3.2' into 3	2015-08-17 11:59:24 +00:00
LeftAndMainExtension.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MemberImportForm.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
ModelAdmin.php	Merge branch '3.1' into 3.2	2015-08-17 11:43:28 +01:00
SecurityAdmin.php	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 13:07:41 +12:00