Commit 1b95d83e authored by jp6g18's avatar jp6g18

Merge branch 'Omar' into 'master'

Omar changes

See merge request !24
parents 13398e31 2c63b0e8
Pipeline #885 failed with stage
in 25 seconds