Merge "Use display name in category page subheadings if provided"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Jul 2016 03:30:55 +0000 (03:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Jul 2016 03:30:55 +0000 (03:30 +0000)
1  2 
includes/CategoryViewer.php

Simple merge