Skip to content
Commit 8ade6bb1 authored by tranoris's avatar tranoris
Browse files

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

Parent child characteristics

See merge request !14
parents 5fffc4e9 39d78257
Pipeline #4632 failed with stage
in 1 minute and 17 seconds