Merge "Convert action=markpatrolled fallback interface to HTTP POST"

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

Tue, 8 Nov 2016 17:43:25 +0000 (17:43 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 8 Nov 2016 17:43:25 +0000 (17:43 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 Nov 2016 17:43:25 +0000 (17:43 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Nov 2016 17:43:25 +0000 (17:43 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/diff/DifferenceEngine.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 8 Nov 2016 17:43:25 +0000 (17:43 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 8 Nov 2016 17:43:25 +0000 (17:43 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/diff/DifferenceEngine.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history