Merge "WLFilters: avoid querying the DB when filters are in conflict"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 25 Aug 2017 17:24:46 +0000 (17:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 25 Aug 2017 17:24:47 +0000 (17:24 +0000)

Trivial merge