Skip to content
Snippets Groups Projects
Commit 593a2f74 authored by Guillaume Eynard-Bontemps's avatar Guillaume Eynard-Bontemps
Browse files

Merge branch 'develop' into 'master'

Merge develop 1.12 into master

See merge request !139
parents c70b712d 55fe288f
No related branches found
No related tags found
2 merge requests!145Fix issue #148,!139Merge develop 1.12 into master
Showing
with 239 additions and 91 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment