Commit 0921795c authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.0-fix-manual' into fix-manual 

Conflicts:
	patches/patch.sh
parents e1d01e84 940f0ec1
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