Commit c4323829 authored by tranoris's avatar tranoris
Browse files

Merge branch 'parent-child-characteristics' into 'develop'

fix integration tests

See merge request !15
parents 8ade6bb1 c5c1dadd
Pipeline #4642 passed with stage
in 1 minute and 55 seconds