Skip to content
Commit 50c2ca11 authored by tranoris's avatar tranoris
Browse files

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

Parent child characteristics

See merge request !10
parents 3381c271 db2ac7a4