[MERGE] merge from trunk addons
[odoo/odoo.git] / addons / stock_location / security /
drwxr-xr-x   ..
-rw-r--r-- 1035 ir.model.access.csv