Merge "upload: Simplify UploadStashTest by using getNewTempFile()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Nov 2017 21:36:11 +0000 (21:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Nov 2017 21:36:11 +0000 (21:36 +0000)

Trivial merge