Commit 8701a86e authored by Michaël Roynard's avatar Michaël Roynard

Merge branch 'dev' into 'master'

add conan support

See merge request !1
parents ed382bff fdefe49b
Pipeline #1946 passed with stage
in 48 seconds