From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 3 Mar 2017 19:32:06 +0000 (+0000)
Subject: Merge "RCFilters UI: Adopt conflict colors"
X-Git-Tag: 1.31.0-rc.0~3905
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=42347bf5351597c432c696591a093d026062dcf8;p=lhc%2Fweb%2Fwiklou.git

Merge "RCFilters UI: Adopt conflict colors"
---

42347bf5351597c432c696591a093d026062dcf8