Merge "Avoid preemptive DB replication waits for farm cross-wiki redirects"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 25 Aug 2017 23:13:52 +0000 (23:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 25 Aug 2017 23:13:52 +0000 (23:13 +0000)
1  2 
includes/DefaultSettings.php

Simple merge