[MERGE] from trunk
[odoo/odoo.git] / addons / .bzrignore
1 .*
2 **/node_modules