Damian Mooyman 230d017677 Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/css/ie7.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/font/icon-reference.html # admin/font/silverstripe.eot # admin/font/silverstripe.svg # admin/font/silverstripe.ttf # admin/font/silverstripe.woff # admin/scss/_forms.scss # admin/scss/_style.scss		2016-02-12 15:41:45 +13:00
..
AdminRootController.php	FEATURE: implement getter and setter usage for response	2015-08-29 10:24:06 +12:00
CMSBatchAction.php	API Deprecate delete in favour of archive	2015-06-03 14:24:27 +12:00
CMSBatchActionHandler.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
CMSForm.php	Form action validation excempts	2014-11-26 22:49:37 +13:00
CMSMenu.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13: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	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-09-09 14:35:29 +12:00
GroupImportForm.php	Update translations	2015-08-24 16:52:39 +12:00
LeftAndMain.php	Merge remote-tracking branch 'origin/3'	2016-02-12 15:41:45 +13:00
LeftAndMainExtension.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MemberImportForm.php	Implement RFC-7 JavaScript module loader	2016-01-26 11:39:20 +13:00
ModelAdmin.php	Implement RFC-7 JavaScript module loader	2016-01-26 11:39:20 +13:00
SecurityAdmin.php	Implement RFC-7 JavaScript module loader	2016-01-26 11:39:20 +13:00