Merge "Re-introduce use of mime_content_type()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 27 Jul 2017 03:05:45 +0000 (03:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 27 Jul 2017 03:05:45 +0000 (03:05 +0000)

Trivial merge