Merge "Fix UploadBase::checkXMLEncodingMissmatch() on PHP 7.1+"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 7 Jun 2018 08:57:27 +0000 (08:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 7 Jun 2018 08:57:27 +0000 (08:57 +0000)

Trivial merge