Merge "Use OutputPage::wrapWikiTextAsInterface() to add safe <div> wrappers"

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

Mon, 22 Oct 2018 02:00:35 +0000 (02:00 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 22 Oct 2018 02:00:35 +0000 (02:00 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 22 Oct 2018 02:00:35 +0000 (02:00 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 22 Oct 2018 02:00:35 +0000 (02:00 +0000)
diff --cc includes/page/Article.php
Simple merge
diff --cc includes/page/ImagePage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 22 Oct 2018 02:00:35 +0000 (02:00 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 22 Oct 2018 02:00:35 +0000 (02:00 +0000)
		1	2
includes/page/Article.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/ImagePage.php	patch \|	diff1 \|	diff2 \|	blob \| history