From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 25 Aug 2017 17:24:46 +0000 (+0000)
Subject: Merge "WLFilters: avoid querying the DB when filters are in conflict"
X-Git-Tag: 1.31.0-rc.0~2301
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=ed1966c1ed85f7ec713dc252f8c526b8f0e42505;p=lhc%2Fweb%2Fwiklou.git

Merge "WLFilters: avoid querying the DB when filters are in conflict"
---

ed1966c1ed85f7ec713dc252f8c526b8f0e42505