From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 30 Jan 2017 17:40:29 +0000 (+0000)
Subject: Merge "PHAN: lock phpstorm-stubs at a specific hash in composer.json"
X-Git-Tag: 1.31.0-rc.0~4192
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=6096ad68e2a24f37af7257f6eb85edf62c53a6ab;p=lhc%2Fweb%2Fwiklou.git

Merge "PHAN: lock phpstorm-stubs at a specific hash in composer.json"
---

6096ad68e2a24f37af7257f6eb85edf62c53a6ab