Commit 1dc7236d authored by Lionel Morin's avatar Lionel Morin

Merge branch 'develop' into 'updated_list'

# Conflicts:
#   scripts/controller
parents 6917c852 59ae4aaa
Pipeline #864 passed with stage
in 0 seconds