Merge "ApiUpload: Raise an error on attempts to async-upload a POSTed file"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 26 Jan 2017 19:33:31 +0000 (19:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Jan 2017 19:33:31 +0000 (19:33 +0000)

Trivial merge