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
271b5f7f15
silverstripe-cms/code
History
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
..
batchactions Fix missing packages 2015-08-24 16:14:33 +12:00
controllers Merge remote-tracking branch 'origin/3' 2015-11-03 14:23:04 +13:00
forms Fix auto-setting of URL from localized page titles 2015-04-29 00:16:53 +12: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' 2015-11-03 14:23:04 +13:00
reports Merge branch '3.1' into 3.2 2015-07-20 11:09:29 +01:00
search Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:23:48 +12:00