[MERGE]: Merged
[odoo/odoo.git] / addons / .bzrignore
1 .*