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

Merge branch 'develop' into 'master' 

Merge develop changes

See merge request !50
parents 94556681 68bd400c
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