Commit d73ae1e1 authored by Jerome Flesch's avatar Jerome Flesch

Merge branch 'testing' into develop

# Conflicts:
#	activate_test_env.sh
Signed-off-by: Jerome Flesch's avatarJerome Flesch <jflesch@openpaper.work>
parents 29d2a355 adfe4751
Pipeline #105415 canceled with stage
in 3 minutes and 7 seconds