Merge branch '3'

Conflicts:
	composer.json
This commit is contained in:
Daniel Hensby 2015-07-20 15:39:40 +01:00
commit 740dbbfb99

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": {