tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-03 06:38:40 +02:00
Code Issues Projects Releases Wiki Activity
4,608 Commits 29 Branches 403 Tags 27 MiB
18e368448a
Commit Graph

4 Commits

Author SHA1 Message Date
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
Peter Thaleikis
4694763fa5 remove trailing spaces in the codebase 2015-09-29 17:18:03 +13:00
Peter Thaleikis
f291c5f365 fixing phpdoc blocks to refering to Objects to built-in types of PHP 2015-09-28 22:31:31 +13:00
Loz Calver
09b869f5d3 Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798) 2013-07-31 09:30:58 +01:00