[MERGE] Merge psi branch : lp:~psi-tinyerp/openobject-addons/trunk-mode3-yaml:
[odoo/odoo.git] / addons / resource / security /
drwxr-xr-x   ..
-rw-r--r-- 524 ir.model.access.csv