Merge remote-tracking branch 'origin/2.4' into 3.0

Conflicts: composer.json
silverstripe · Nov 8, 2012 · ff0939f · ff0939f
2 parents 744605d + f8e860f
commit ff0939f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -2,10 +2,10 @@
 	"name": "silverstripe/installer",
 	"description": "The SilverStripe Framework Installer",
 	"require": {
-		"php": ">=5.3.2",
-		"silverstripe/cms": "self.version",
-		"silverstripe/framework": "self.version",
-		"silverstripe-themes/simple": "*"
+		"php": ">=5.2.4",
+		"silverstripe/cms": "2.4.x-dev",
+		"silverstripe/framework": "2.4.x-dev",
+		"silverstripe-themes/blackcandy": "2.4.x-dev"
 	},
 	"require-dev": {
 		"silverstripe/compass": "*",