Merge "Move cookie-blocking methods to BlockManager"

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

Tue, 11 Jun 2019 15:16:00 +0000 (15:16 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 11 Jun 2019 15:16:00 +0000 (15:16 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 11 Jun 2019 15:16:00 +0000 (15:16 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 11 Jun 2019 15:16:00 +0000 (15:16 +0000)
diff --cc RELEASE-NOTES-1.34
Simple merge
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/user/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 11 Jun 2019 15:16:00 +0000 (15:16 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 11 Jun 2019 15:16:00 +0000 (15:16 +0000)
		1	2
RELEASE-NOTES-1.34	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/user/User.php	patch \|	diff1 \|	diff2 \|	blob \| history