Merge "mediawiki.api.upload: Fix test assumption about <iframe>"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 26 Mar 2018 22:40:46 +0000 (22:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 26 Mar 2018 22:40:46 +0000 (22:40 +0000)

Trivial merge