Merge "Prepare for REL1_32 cut, labelling master as 1.33-alpha"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 17 Oct 2018 01:52:30 +0000 (01:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 17 Oct 2018 01:52:30 +0000 (01:52 +0000)
1  2 
includes/DefaultSettings.php

Simple merge