Skip to content
Snippets Groups Projects
Commit 3393862d authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.0' into v2.1 

Conflicts:
	VERSION
parents d63afa71 4b63e4e9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment