Merge "Ensure users are able to edit the page after changing the content model"

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

Fri, 23 Sep 2016 06:16:11 +0000 (06:16 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 23 Sep 2016 06:16:11 +0000 (06:16 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Sep 2016 06:16:11 +0000 (06:16 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Sep 2016 06:16:11 +0000 (06:16 +0000)
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/Title.php
Simple merge
diff --cc includes/specials/SpecialChangeContentModel.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 23 Sep 2016 06:16:11 +0000 (06:16 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 23 Sep 2016 06:16:11 +0000 (06:16 +0000)
		1	2
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialChangeContentModel.php	patch \|	diff1 \|	diff2 \|	blob \| history