Merge "resourceloader: Avoid mw-exception log spam from PHPUnit tests"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 15 Jul 2017 18:23:49 +0000 (18:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 15 Jul 2017 18:23:49 +0000 (18:23 +0000)

Trivial merge