tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
7dfe145412
silverstripe-cms/code
History
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
..
batchactions MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
controllers Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +13:00
forms MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
logging API Move ErrorPage to new generated files API 2015-10-23 10:08:51 +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