Damian Mooyman 18e368448a Merge remote-tracking branch 'origin/3' ... Conflicts: code/controllers/AssetAdmin.php code/controllers/CMSMain.php code/controllers/CMSSiteTreeFilter.php code/controllers/LeftAndMainPageIconsExtension.php code/controllers/ModelAsController.php code/controllers/SilverStripeNavigator.php code/model/ErrorPage.php code/model/SiteTreeFileExtension.php		2015-11-03 14:23:04 +13:00
..
AssetAdmin.php	Merge remote-tracking branch 'origin/3'	2015-11-03 14:23:04 +13:00
CMSMain.php	Merge remote-tracking branch 'origin/3.2' into 3	2015-11-03 13:11:26 +13:00
CMSPageAddController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
CMSPageEditController.php	API Marked statics private, use Config API instead (#8317)	2013-03-24 17:21:04 +01:00
CMSPageHistoryController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
CMSPagesController.php	Merge remote-tracking branch 'origin/3'	2015-11-03 14:23:04 +13:00
CMSPageSettingsController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
CMSSettingsController.php	increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain	2015-06-22 14:15:49 +02:00
CMSSiteTreeFilter.php	Merge remote-tracking branch 'origin/3'	2015-11-03 14:23:04 +13:00
ContentController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
ErrorPageControllerExtension.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
LeftAndMainPageIconsExtension.php	Merge remote-tracking branch 'origin/3'	2015-11-03 14:23:04 +13:00
ModelAsController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
NestedController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
OldPageRedirector.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
RootURLController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
SilverStripeNavigator.php	Merge remote-tracking branch 'origin/3'	2015-11-03 14:23:04 +13:00