Merge "Revert "Use display name in category page subheadings if provided""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 Nov 2016 23:55:35 +0000 (23:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Nov 2016 23:55:35 +0000 (23:55 +0000)
1  2 
includes/CategoryViewer.php

Simple merge