Merge branch '4.10' into 4
This commit is contained in:
commit
e1d2cd30e6
|
@ -5,7 +5,7 @@ import:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- REQUIRE_RECIPE_TESTING="^1"
|
- REQUIRE_RECIPE_TESTING="^2"
|
||||||
- REQUIRE_FRAMEWORKTEST="^0.4.2"
|
- REQUIRE_FRAMEWORKTEST="^0.4.2"
|
||||||
# vfsstream is a dev dependency of the assets module
|
# vfsstream is a dev dependency of the assets module
|
||||||
- REQUIRE_EXTRA="mikey179/vfsstream:^1.6"
|
- REQUIRE_EXTRA="mikey179/vfsstream:^1.6"
|
||||||
|
|
Loading…
Reference in New Issue