Merge "Tests can't call resetGlobalServices()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 9 Aug 2018 18:16:01 +0000 (18:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 9 Aug 2018 18:16:01 +0000 (18:16 +0000)

Trivial merge