Merge "Use file width/height instead of metadata for getContentHeaders"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 24 May 2017 06:44:54 +0000 (06:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 24 May 2017 06:44:54 +0000 (06:44 +0000)
1  2 
includes/media/FormatMetadata.php

Simple merge