Merge "Generalize recentChangesFlags rollup"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 2 Apr 2016 16:21:12 +0000 (16:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 2 Apr 2016 16:21:12 +0000 (16:21 +0000)
1  2 
includes/DefaultSettings.php

Simple merge