On 05/24/2016 04:02 AM, Jean-Pierre Chrétien wrote: > Le 23/05/2016 23:22, Jean-Pierre Chrétien a écrit : >> Hello, >> >> Jean-Marc pointed out to me a mistake and a shortcut conflict, I have >> 2 commits >> ready fot these. Should this wait for 2.2.1 or may I push to master ? >> > > Richard, one shortcut conflict resolution should be backported to 2.1.5. > Okay to push ?
Yes, that's fine. rh
