[MERGE] Sync with trunk
[odoo/odoo.git] / addons / delivery / security /
drwxr-xr-x   ..
-rw-r--r-- 813 ir.model.access.csv