From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 6 Apr 2018 23:04:48 +0000 (+0000)
Subject: Merge "Provide PHPUnit 4 and 6 compatibility layer"
X-Git-Tag: 1.31.0-rc.0~173
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/wiki/%7B%7B%20url_for%28%27admin_vote_deletechoice%27%2C%20voteid=vote.id%2C%20choiceid=choice.id%29%20%7D%7D?a=commitdiff_plain;h=f1d64e2fc641673c0b3c15a591b522f4ce813be9;p=lhc%2Fweb%2Fwiklou.git

Merge "Provide PHPUnit 4 and 6 compatibility layer"
---

f1d64e2fc641673c0b3c15a591b522f4ce813be9