mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge branch '3.5' into 3.6
This commit is contained in:
commit
b2f6456922
@ -22,13 +22,16 @@
|
||||
"silverstripe/reports": "~3.4",
|
||||
"silverstripe/siteconfig": "~3.4"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^3 || ^4 || ^5"
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"3.x-dev": "3.6.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": ["tests/behat/"]
|
||||
"classmap": ["tests/behat/", "code"]
|
||||
},
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user