Merge "Add new 'ArticleShowPatrolFooter' hook to allow extensions to decide if the...

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

Sat, 14 Jul 2018 22:33:29 +0000 (22:33 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 14 Jul 2018 22:33:29 +0000 (22:33 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 14 Jul 2018 22:33:29 +0000 (22:33 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 14 Jul 2018 22:33:29 +0000 (22:33 +0000)
diff --cc RELEASE-NOTES-1.32
Simple merge
diff --cc docs/hooks.txt
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sat, 14 Jul 2018 22:33:29 +0000 (22:33 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 14 Jul 2018 22:33:29 +0000 (22:33 +0000)
		1	2
RELEASE-NOTES-1.32	patch \|	diff1 \|	diff2 \|	blob \| history
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history