Merge "Warn if stateful ParserOutput transforms are used"

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

Fri, 2 Feb 2018 02:45:27 +0000 (02:45 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 2 Feb 2018 02:45:27 +0000 (02:45 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 2 Feb 2018 02:45:27 +0000 (02:45 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 2 Feb 2018 02:45:27 +0000 (02:45 +0000)
diff --cc includes/parser/ParserOutput.php
Simple merge
diff --cc tests/phpunit/includes/parser/ParserOutputTest.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 2 Feb 2018 02:45:27 +0000 (02:45 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 2 Feb 2018 02:45:27 +0000 (02:45 +0000)
		1	2
includes/parser/ParserOutput.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/includes/parser/ParserOutputTest.php	patch \|	diff1 \|	diff2 \|	blob \| history