[MERGE] Sync with trunk
[odoo/odoo.git] / addons / website / data /
drwxr-xr-x   ..
-rw-r--r-- 8916 website_data.xml
-rw-r--r-- 5597 website_demo.xml