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

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

fix integration tests

See merge request !15
parents 8ade6bb1 c5c1dadd
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment