Commit 84ca598f authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.3' into v2.4 

[makedoc]

Conflicts:
	CHANGES/v2.3.md
parents 6688be53 5d525bbe
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