[MERGE] fix bug 715790
[odoo/odoo.git] / addons / .bzrignore
1 .*