Merge "OutputPage: Support UploadPath in testTransformResourcePath()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 11 Feb 2017 05:16:44 +0000 (05:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 11 Feb 2017 05:16:45 +0000 (05:16 +0000)

Trivial merge