Commit aa9a8797 authored by Alexandre Boyer's avatar Alexandre Boyer
Browse files

Merge branch 'master' into 'development'

# Conflicts:
#   .gitignore
#   CHANGELOG.md
#   diva_evaluation_cli/__init__.py
#   diva_evaluation_cli/bin/commands/actev_validate_execution.py
#   diva_evaluation_cli/bin/private_src/entry_points/actev_validate_execution.py
#   requirements.txt
parents 01ee2a68 1231567c
Pipeline #124264 passed with stage
in 28 seconds