[MERGE] merge with latest stable
[odoo/odoo.git] / addons / product / process /
drwxr-xr-x   ..
-rw-r--r-- 2386 product_process.xml