revert pso merge because of conflicts
[odoo/odoo.git] / addons / product / process /
drwxr-xr-x   ..
-rw-r--r-- 5252 product_process.xml