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

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

Parent child characteristics

See merge request !7
parents f8db4939 d1f8e6bf