mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merge branch '3'
Conflicts: composer.json
This commit is contained in:
commit
740dbbfb99
@ -12,7 +12,7 @@
|
||||
"homepage": "http://silverstripe.org"
|
||||
}],
|
||||
"require": {
|
||||
"php": ">=5.3.2",
|
||||
"php": ">=5.3.3",
|
||||
"silverstripe/framework": ">=3.1.x-dev"
|
||||
},
|
||||
"extra": {
|
||||
|
Loading…
Reference in New Issue
Block a user