Merge "PHAN: lock phpstorm-stubs at a specific hash in composer.json"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 30 Jan 2017 17:40:29 +0000 (17:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 30 Jan 2017 17:40:30 +0000 (17:40 +0000)

Trivial merge