Skip to content
Commit b6d5d1f5 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.4' into v2.5 

cc: @gtribello

It looks like the change was implemented separately in 2.4 and 2.5
parents 696c7d87 0391c6ac
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment