Commit 3c6c00ef authored by Thomas's avatar Thomas

Merge branch 'working' into 'develop'

some changes

See merge request !976
parents 8f641fba 25c05ef4
Pipeline #211130 passed with stage
in 7 minutes and 38 seconds