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
..
GridFieldSubsiteDetailForm.php	Merge remote-tracking branch 'origin/0.3'	2013-01-03 21:03:26 +01:00
SubsiteAgnosticTableListField.php	BUG: Modifying the module to work with SS 3.0	2012-07-16 11:18:38 +12:00
SubsitesTreeDropdownField.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