Merge "Add tags for undo edits"

author Nikerabbit <niklas.laxstrom@gmail.com>

Thu, 21 Dec 2017 07:27:17 +0000 (07:27 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 21 Dec 2017 07:27:17 +0000 (07:27 +0000)
author Nikerabbit <niklas.laxstrom@gmail.com>
Thu, 21 Dec 2017 07:27:17 +0000 (07:27 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 21 Dec 2017 07:27:17 +0000 (07:27 +0000)
diff --cc includes/DefaultSettings.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	Nikerabbit <niklas.laxstrom@gmail.com>
	Thu, 21 Dec 2017 07:27:17 +0000 (07:27 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 21 Dec 2017 07:27:17 +0000 (07:27 +0000)
		1	2
includes/DefaultSettings.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