Merge branch '3.2' into 3

This commit is contained in:
Daniel Hensby 2015-07-20 15:37:49 +01:00
commit c56b92a4c3

View File

@ -12,7 +12,7 @@
"homepage": "http://silverstripe.org" "homepage": "http://silverstripe.org"
}], }],
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.3",
"silverstripe/framework": ">=3.1.x-dev" "silverstripe/framework": ">=3.1.x-dev"
}, },
"extra": { "extra": {