Merge "Send a cookie with IP/IP-Range blocks when blocking logged-out users"

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

Mon, 28 May 2018 13:35:21 +0000 (13:35 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 28 May 2018 13:35:21 +0000 (13:35 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 28 May 2018 13:35:21 +0000 (13:35 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 28 May 2018 13:35:21 +0000 (13:35 +0000)
diff --cc RELEASE-NOTES-1.32
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/EditPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 28 May 2018 13:35:21 +0000 (13:35 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 28 May 2018 13:35:21 +0000 (13:35 +0000)
		1	2
RELEASE-NOTES-1.32	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history