master/bt5/vifib_open_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml · 2f169d6a3dd53ad787c84965cfdf415d573f5aff · nexedi / slapos.core

Merge branch 'master' into rename_instance · 2f169d6a

Antoine Catton authored Jan 23, 2012

Conflicts:
	master/bt5/vifib_open_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
	master/bt5/vifib_open_trade/bt/template_portal_type_property_sheet_list

2f169d6a

property_sheet_list.xml 226 Bytes

Replace property_sheet_list.xml