Merge "resourceloader: Complete test coverage for FileModule::getTemplates()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 27 Jun 2017 13:16:46 +0000 (13:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 27 Jun 2017 13:16:46 +0000 (13:16 +0000)

Trivial merge