Merge "RCFilters UI: Rework conflicts to be objects in filter or group context"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Mar 2017 21:41:38 +0000 (21:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Mar 2017 21:41:38 +0000 (21:41 +0000)

Trivial merge