[MERGE] Merge from the main trunk addons
[odoo/odoo.git] / addons / resource / security /
drwxr-xr-x   ..
-rw-r--r-- 641 ir.model.access.csv