Merge "RCFilters UI: Adopt conflict colors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 3 Mar 2017 19:32:06 +0000 (19:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 3 Mar 2017 19:32:06 +0000 (19:32 +0000)
commit42347bf5351597c432c696591a093d026062dcf8
treefb0c5d273c548b90e311af895d467cac7135613f
parentcbac334f116c6546c422a67ce99d2a56eb792d30
parent00ec42206d4821962d41b6f233765f5b860c6130
Merge "RCFilters UI: Adopt conflict colors"