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

Merge branch 'v2.1' 

Conflicts:
	configure
parents fe4c64e1 c9c49973
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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