Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco
[odoo/odoo.git] / addons / website_partner / data /
drwxr-xr-x   ..
-rw-r--r-- 23666 demo.xml
-rw-r--r-- 218 website_data.xml