Merge "Allow minor edits to be filtered out of Special:Contributions"

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

Thu, 9 Jun 2016 20:13:28 +0000 (20:13 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 9 Jun 2016 20:13:28 +0000 (20:13 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 9 Jun 2016 20:13:28 +0000 (20:13 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 9 Jun 2016 20:13:28 +0000 (20:13 +0000)
diff --cc includes/api/i18n/en.json
Simple merge
diff --cc includes/api/i18n/qqq.json
Simple merge
diff --cc includes/specials/pagers/ContribsPager.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>
	Thu, 9 Jun 2016 20:13:28 +0000 (20:13 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 9 Jun 2016 20:13:28 +0000 (20:13 +0000)
		1	2
includes/api/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/pagers/ContribsPager.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history