[MERGE] merge bzr saas-4 web branch
[odoo/odoo.git] / addons / hr_payroll / security /
drwxr-xr-x   ..
-rw-r--r-- 650 hr_security.xml
-rw-r--r-- 1061 ir.model.access.csv