Merge "Return $wgSitename as displayname for local repo in filerepoinfo API"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 May 2014 06:38:40 +0000 (06:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 May 2014 06:38:40 +0000 (06:38 +0000)
1  2 
includes/filerepo/FileRepo.php

Simple merge