Commit 840d38ee authored by Lionel Morin's avatar Lionel Morin
Browse files

Merge branch 'develop' into 'updated_list'

# Conflicts:
#   scripts/controller
parents 52fe8717 17afe2c9
Pipeline #867 passed with stage
in 0 seconds