Commit fd91c052 authored by Hugo's avatar Hugo

Merge branch 'master' into 'develop'

Merge branch 'develop' into 'master'

Develop



See merge request !1

See merge request !2
parents 62443790 82797a39
Pipeline #372 passed with stage
in 37 seconds