Merge "Make undo fail if more than just the main slot is affected."

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

Sat, 23 Jun 2018 08:59:37 +0000 (08:59 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 23 Jun 2018 08:59:37 +0000 (08:59 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 23 Jun 2018 08:59:37 +0000 (08:59 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 23 Jun 2018 08:59:37 +0000 (08:59 +0000)
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/page/WikiPage.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>
	Sat, 23 Jun 2018 08:59:37 +0000 (08:59 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 23 Jun 2018 08:59:37 +0000 (08:59 +0000)
		1	2
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history