Merge "Prepare for REL1_33 cut, labelling master as 1.34-alpha"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Thu, 11 Apr 2019 00:29:00 +0000 (00:29 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 11 Apr 2019 00:29:00 +0000 (00:29 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 11 Apr 2019 00:29:00 +0000 (00:29 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 11 Apr 2019 00:29:00 +0000 (00:29 +0000)
diff --cc RELEASE-NOTES-1.33
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 11 Apr 2019 00:29:00 +0000 (00:29 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 11 Apr 2019 00:29:00 +0000 (00:29 +0000)
		1	2
RELEASE-NOTES-1.33	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history