merge upstream
[odoo/odoo.git] / addons / website_sale / data /
drwxr-xr-x   ..
-rw-r--r-- 1447 website_sale_data.xml
-rw-r--r-- 33213 website_sale_demo.xml