Merge "Update $wgMainStash comments and merge in those from a deprecated ObjectCache...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 11 Jul 2019 02:10:14 +0000 (02:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 11 Jul 2019 02:10:14 +0000 (02:10 +0000)
1  2 
includes/DefaultSettings.php

Simple merge