silverstripe-subsites/code/model
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
..
RelatedPageLink.php Removing unncessary end PHP tags from subsites code 2012-10-12 11:08:24 +13:00
Subsite.php Merge remote-tracking branch 'origin/0.3' 2013-01-03 21:03:26 +01:00
SubsiteDomain.php BUG: Merged patch from kmayo how ever re-added some of the removed fields since they really should appear on the Main Content tab instead of the Metadata tab. 2012-07-16 11:21:54 +12:00