Merge "Pass context to FormatMetadata class on ImagePage"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 13 Mar 2015 07:01:30 +0000 (07:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Mar 2015 07:01:30 +0000 (07:01 +0000)
1  2 
includes/filerepo/file/File.php
includes/page/ImagePage.php

Simple merge
Simple merge