Merge "RCFilters: Only show filter capsule as conflicted if it's selected"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 23 Mar 2017 18:25:21 +0000 (18:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 23 Mar 2017 18:25:21 +0000 (18:25 +0000)

Trivial merge