Skip to content
Commit 6394cb3b authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

Merge branch 'develop' into 'master' 

prepare for 1.3 release

See merge request !136
parents 94f1baa7 305439e1
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