Merge branch '3.2' into 3

This commit is contained in:
Daniel Hensby 2015-07-20 15:37:49 +01:00
commit c56b92a4c3
1 changed files with 1 additions and 1 deletions

View File

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