tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-06-26 06:29:26 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	composer.json
This commit is contained in:
Ingo Schommer 2012-11-08 19:51:44 +01:00
commit ff0939fe0d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.json
View File

@ -2,10 +2,10 @@
"name": "silverstripe/installer", "name": "silverstripe/installer",
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.2.4",
"silverstripe/cms": "self.version", "silverstripe/cms": "2.4.x-dev",
"silverstripe/framework": "self.version", "silverstripe/framework": "2.4.x-dev",
"silverstripe-themes/simple": "*" "silverstripe-themes/blackcandy": "2.4.x-dev"
}, },
"require-dev": { "require-dev": {
"silverstripe/compass": "*", "silverstripe/compass": "*",