From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 14 Mar 2018 20:46:58 +0000 (+0000)
Subject: Merge "resourceloader: Fix broken code in load.php mock used to make a test fail"
X-Git-Tag: 1.31.0-rc.0~381
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=9935b156211812c3800318fe1c7fe3dfb4c47b24;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Fix broken code in load.php mock used to make a test fail"
---

9935b156211812c3800318fe1c7fe3dfb4c47b24