From: jenkins-bot Date: Thu, 23 Mar 2017 18:25:21 +0000 (+0000) Subject: Merge "RCFilters: Only show filter capsule as conflicted if it's selected" X-Git-Tag: 1.31.0-rc.0~3714 X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=ac1dabf85c19370cf5b260ddc2c363e3f36d29e9;p=lhc%2Fweb%2Fwiklou.git Merge "RCFilters: Only show filter capsule as conflicted if it's selected" --- ac1dabf85c19370cf5b260ddc2c363e3f36d29e9