Merge "RCFilters UI: Add a 'what's this?' link to filter groups"

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

Fri, 17 Mar 2017 20:05:21 +0000 (20:05 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 17 Mar 2017 20:05:22 +0000 (20:05 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 17 Mar 2017 20:05:21 +0000 (20:05 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 17 Mar 2017 20:05:22 +0000 (20:05 +0000)
diff --cc resources/Resources.php
Simple merge
diff --cc resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
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, 17 Mar 2017 20:05:21 +0000 (20:05 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 17 Mar 2017 20:05:22 +0000 (20:05 +0000)
		1	2
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js	patch \|	diff1 \|	diff2 \|	blob \| history