Merge "Use Diffusion for default Git Viewer"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 25 Mar 2016 19:20:13 +0000 (19:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 25 Mar 2016 19:20:13 +0000 (19:20 +0000)
1  2 
includes/DefaultSettings.php

Simple merge