Merge "Don't show patrol links if RCP/NPP are disabled, but file patrol isn't"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 17 Feb 2016 16:31:47 +0000 (16:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 17 Feb 2016 16:31:47 +0000 (16:31 +0000)
1  2 
includes/page/Article.php

Simple merge