[MERGE] merge from trunk addons
[odoo/odoo.git] / addons / document_ftp / security /
drwxr-xr-x   ..
-rwxr-xr-x 94 ir.model.access.csv