bt5/erp5_dms_conversion_catalog/bt/revision · 9b292489fe2bf6165d9dae4ff9980e02a8ef5a23 · nexedi / erp5

Merge branch 'master' into cache · 938f4bc7

Ivan Tyagov authored Oct 17, 2012

Conflicts:
	bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/WebPage_preConvertReferencedImageList.xml
	bt5/erp5_dms_conversion_catalog/bt/revision
	product/ERP5OOo/tests/testDmsWithPreConversion.py

938f4bc7

revision 3 Bytes

Replace revision