[MERGE] from trunk
[odoo/odoo.git] / addons / mrp / static / img /
drwxr-xr-x   ..
-rw-r--r-- 5090 product_assembly-image.jpg