[MERGE]:merged with trunk
[odoo/odoo.git] / addons / mrp / security /
drwxr-xr-x   ..
-rw-r--r-- 9497 ir.model.access.csv
-rw-r--r-- 2925 mrp_security.xml