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

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

Parent child characteristics

See merge request !14
parents 5fffc4e9 39d78257
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment