Fixed dependency errors

Probably a faulty merge from 2.4
This commit is contained in:
Ingo Schommer 2014-02-10 11:23:11 +13:00
parent ec5c9fb966
commit 34eb6678d8

View File

@ -18,7 +18,7 @@
"require": { "require": {
"php": ">=5.2.4", "php": ">=5.2.4",
"composer/installers": "*", "composer/installers": "*",
"silverstripe/framework": "2.4" "silverstripe/framework": "2.5.x-dev"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {