Merge "Make $wgRevisionCacheExpiry default to one week"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 9 Sep 2016 10:37:49 +0000 (10:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 9 Sep 2016 10:37:49 +0000 (10:37 +0000)
1  2 
includes/DefaultSettings.php
includes/Revision.php

Simple merge
Simple merge