Merge "Propagate the favicon information to getInfo() for local repos"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 Jan 2014 00:19:27 +0000 (00:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Jan 2014 00:19:27 +0000 (00:19 +0000)
1  2 
includes/filerepo/FileRepo.php
includes/filerepo/LocalRepo.php

Simple merge
Simple merge