tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-27 23:19:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5' into 3.6

Browse Source
This commit is contained in:
Daniel Hensby 2017-11-25 18:20:22 +00:00
commit b2f6456922
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -22,13 +22,16 @@
"silverstripe/reports": "~3.4", "silverstripe/reports": "~3.4",
"silverstripe/siteconfig": "~3.4" "silverstripe/siteconfig": "~3.4"
}, },
"require-dev": {
"phpunit/phpunit": "^3 || ^4 || ^5"
},
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"3.x-dev": "3.6.x-dev" "3.x-dev": "3.6.x-dev"
} }
}, },
"autoload": { "autoload": {
"classmap": ["tests/behat/"] "classmap": ["tests/behat/", "code"]
}, },
"minimum-stability": "dev" "minimum-stability": "dev"
} }