mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge branch '3.6' into 3
This commit is contained in:
commit
a20f4f29f6
@ -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.7.x-dev"
|
"3.x-dev": "3.7.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"classmap": ["tests/behat/"]
|
"classmap": ["tests/behat/", "code"]
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev"
|
"minimum-stability": "dev"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user