Merge branch '3.0.5' into 3.0

This commit is contained in:
Ingo Schommer 2013-02-20 12:17:01 +01:00
commit 3c6ef63734

View File

@ -3,8 +3,8 @@
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.2",
"silverstripe/cms": "3.0.*", "silverstripe/cms": "3.0.*@stable",
"silverstripe/framework": "3.0.*", "silverstripe/framework": "3.0.*@stable",
"silverstripe-themes/simple": "*" "silverstripe-themes/simple": "*"
}, },
"require-dev": { "require-dev": {