Skip to content
Commit b4295c89 authored by Josep Maria Viñolas Auquer's avatar Josep Maria Viñolas Auquer
Browse files

Merge branch 'develop' into 'master' 

Develop

See merge request !24
parents ae3c4281 74d3addb
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment