[MERGE] latest trunk
[odoo/odoo.git] / addons / mail / security /
drwxr-xr-x   ..
-rw-r--r-- 709 ir.model.access.csv
-rw-r--r-- 1201 mail_security.xml