Damian Mooyman 7dfe145412 Merge remote-tracking branch 'origin/3' ...

# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml

2016-01-20 13:16:43 +13:00

..

_old

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

CMSMain.css

API-CHANGE sapphire folder can now be renamed.

2012-04-15 10:56:40 +12:00

screen.css

move allowed extensions into a sidebar

2015-11-05 19:33:58 +13:00

SilverStripeNavigator.css

Make message always visible at the top of the page

2013-03-18 16:28:28 +02:00