silverstripe-cms/tests
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
..
behat Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +13:00
controller FIX: Changes needed to respond to whitespace changes. 2016-01-07 10:34:01 +13:00
model Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +13:00
reports MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
search MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
tasks MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00