Merge "Allow PHPUnit 6 optionally in require-dev"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 13 Apr 2018 17:59:57 +0000 (17:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Apr 2018 17:59:57 +0000 (17:59 +0000)

Trivial merge