-
Antoine Catton authored
Conflicts: master/bt5/vifib_open_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml master/bt5/vifib_open_trade/bt/template_portal_type_property_sheet_list
2f169d6a
Conflicts: master/bt5/vifib_open_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml master/bt5/vifib_open_trade/bt/template_portal_type_property_sheet_list