projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MERGE] Merged demo homepage improvements
[odoo/odoo.git]
/
addons
/
website
/
__openerp__.py
diff --git
a/addons/website/__openerp__.py
b/addons/website/__openerp__.py
index
0341cca
..
e9b545c
100644
(file)
--- a/
addons/website/__openerp__.py
+++ b/
addons/website/__openerp__.py
@@
-22,8
+22,9
@@
OpenERP Website CMS
],
'demo': [
'data/website_demo.xml',
],
'demo': [
'data/website_demo.xml',
+ 'data/website_homepage_demo.xml',
],
'js': ['static/src/js/website.backend.js'],
],
'js': ['static/src/js/website.backend.js'],
- 'qweb' : ['static/src/xml/website.backend.xml'],
+ 'qweb': ['static/src/xml/website.backend.xml'],
'css': ['static/src/css/website.backend.css'],
}
'css': ['static/src/css/website.backend.css'],
}