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