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

Merge branch 'develop' into 'master' 

Merge develop into master

See merge request !52
parents f742da68 ce50a226
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