Wim Leers pushed to project branch propshape at Issue forks / experience_builder-3461499

Wim Leers (7b84f3db) at 01 Aug 06:38

Last bit of merge conflict resolution failure ?