• Ivan Tyagov's avatar
    Merge remote-tracking branch 'klaus/master' into klaus_improvements · 1509b040
    Ivan Tyagov authored
    Conflicts:
    	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArray.py
    	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArray.xml
    	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataBucketStream.py
    	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataBucketStream.xml
    	bt5/erp5_wendelin/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
    	bt5/erp5_wendelin/bt/template_action_path_list
    	bt5/erp5_wendelin/bt/template_portal_type_id_list
    	bt5/erp5_wendelin/bt/template_portal_type_property_sheet_list
    1509b040
document.erp5.DataArray.py 10.1 KB