mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-09-28 20:29:09 +02:00
Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts: composer.json
This commit is contained in:
commit
ff0939fe0d
@ -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": "*",
|
||||||
|
Loading…
Reference in New Issue
Block a user