[MERGE] from master
[odoo/odoo.git] / addons / website_blog / data /
drwxr-xr-x   ..
-rw-r--r-- 1683 website_blog_data.xml
-rw-r--r-- 10458 website_blog_demo.xml