[MERGE] merge bzr saas-4 web branch
[odoo/odoo.git] / addons / .bzrignore
1 .*
2 **/node_modules