silverstripe-subsites/code
Ingo Schommer 82f1d980e8 Merge remote-tracking branch 'origin/0.3'
Conflicts:
	code/SubsiteAdmin.php
	code/extensions/LeftAndMainSubsites.php
	code/extensions/SiteTreeSubsites.php
	code/model/Subsite.php
	composer.json
	javascript/SubsitesTreeDropdownField.js
	lang/en_US.php
	tests/SubsiteAdminTest.php
	tests/SubsiteTest.php
	tests/SubsiteTest.yml
	tests/SubsitesVirtualPageTest.php
2013-01-03 21:03:26 +01:00
..
extensions Merge remote-tracking branch 'origin/0.3' 2013-01-03 21:03:26 +01:00
forms Merge remote-tracking branch 'origin/0.3' 2013-01-03 21:03:26 +01:00
model Merge remote-tracking branch 'origin/0.3' 2013-01-03 21:03:26 +01:00
tasks SubsiteCopyPagesTask 2013-01-03 14:10:14 +01:00
SubsiteAdmin.php Merge remote-tracking branch 'origin/0.3' 2013-01-03 21:03:26 +01:00
SubsiteReportWrapper.php BUG: Modifying the module to work with SS 3.0 2012-07-16 11:18:38 +12:00
SubsitesVirtualPage.php Removing unncessary end PHP tags from subsites code 2012-10-12 11:08:24 +13:00