[MERGE]: Merge with lp:openobject-trunk-dev-addons2
[odoo/odoo.git] / addons / wiki / security /
drwxr-xr-x   ..
-rw-r--r-- 636 ir.model.access.csv
-rw-r--r-- 655 wiki_security.xml