From: jenkins-bot Date: Thu, 16 Mar 2017 21:41:38 +0000 (+0000) Subject: Merge "RCFilters UI: Rework conflicts to be objects in filter or group context" X-Git-Tag: 1.31.0-rc.0~3782 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=d7e0948462ccf43cad6e6bbe237eac8a25f43f1a;p=lhc%2Fweb%2Fwiklou.git Merge "RCFilters UI: Rework conflicts to be objects in filter or group context" --- d7e0948462ccf43cad6e6bbe237eac8a25f43f1a