[MERGE] from trunk
[odoo/odoo.git] / addons / portal / security /
drwxr-xr-x   ..
-rw-r--r-- 395 ir.model.access.csv
-rw-r--r-- 652 portal_security.xml