silverstripe-framework/admin/code
Daniel Hensby ca8d0f2818 Merge branch '3.1' into 3.2
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
2015-07-20 10:48:01 +01: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 API Deprecate delete in favour of archive 2015-06-03 14:24:27 +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 branch '3.1' into 3.2 2015-07-20 10:48:01 +01: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 Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
SecurityAdmin.php Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00