[MERGE]merge with trunk addons
[odoo/odoo.git] / addons / hr / security /
drwxr-xr-x   ..
-rw-r--r-- 1431 hr_security.xml
-rw-r--r-- 964 ir.model.access.csv