Merge "Deprecate User::getPasswordValidity()"

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

Fri, 21 Dec 2018 05:06:40 +0000 (05:06 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 21 Dec 2018 05:06:40 +0000 (05:06 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 21 Dec 2018 05:06:40 +0000 (05:06 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 21 Dec 2018 05:06:40 +0000 (05:06 +0000)
diff --cc RELEASE-NOTES-1.33
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 21 Dec 2018 05:06:40 +0000 (05:06 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 21 Dec 2018 05:06:40 +0000 (05:06 +0000)
		1	2
RELEASE-NOTES-1.33	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history