Merge "Change "slave" => "replica DB" in /maintenance"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 6 Sep 2016 01:05:50 +0000 (01:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 6 Sep 2016 01:05:50 +0000 (01:05 +0000)
1  2 
autoload.php
maintenance/Maintenance.php
maintenance/updateCollation.php

diff --cc autoload.php
Simple merge
Simple merge
Simple merge