Merge "RCFilters: Change to the new views redesign"

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

Fri, 23 Jun 2017 00:06:45 +0000 (00:06 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 23 Jun 2017 00:06:46 +0000 (00:06 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Jun 2017 00:06:45 +0000 (00:06 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Jun 2017 00:06:46 +0000 (00:06 +0000)
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
diff --cc resources/Resources.php
Simple merge
diff --cc resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 23 Jun 2017 00:06:45 +0000 (00:06 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 23 Jun 2017 00:06:46 +0000 (00:06 +0000)
		1	2
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js	patch \|	diff1 \|	diff2 \|	blob \| history