Skip to content
Browse files

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

Conflicts:
	composer.json
  • Loading branch information...
2 parents 744605d + f8e860f commit ff0939fe0d86b38d74cc0ca584025f9c8d0608b7 @chillu chillu committed Nov 8, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 composer.json
View
8 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": "*",

0 comments on commit ff0939f

Please sign in to comment.
Something went wrong with that request. Please try again.