tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3' 

Conflicts:
	composer.json
This commit is contained in:
Daniel Hensby 2015-07-20 15:39:40 +01:00
parent bcc7f358a8 c56b92a4c3
commit 740dbbfb99
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
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": {