Commit 1e14a0b2 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.0' 

Conflicts:
	user-doc/Intro.txt
parents 6fa03bf3 08606f19
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