Merge branch '4.0' into 4

This commit is contained in:
Robbie Averill 2018-10-16 17:33:09 +02:00
commit 94dca0e56a

View File

@ -42,11 +42,7 @@
"SilverStripe\\BehatExtension\\Tests\\": "tests/php/" "SilverStripe\\BehatExtension\\Tests\\": "tests/php/"
} }
}, },
"extra": { "extra": [],
"branch-alias": {
"3.x-dev": "3.1.x-dev"
}
},
"bin": [ "bin": [
"bin/behat-ss" "bin/behat-ss"
], ],