[MERGE] saas-3
authorAntony Lesuisse <al@openerp.com>
Sun, 9 Feb 2014 14:03:15 +0000 (15:03 +0100)
committerAntony Lesuisse <al@openerp.com>
Sun, 9 Feb 2014 14:03:15 +0000 (15:03 +0100)
commit87172d90d25c278a4b42db0b90a759d83b29f6cd
treef6c50386fb126d6faf7cad694dc3ec804eb97acc
parente8aa9751b2154e72a7ed55c027543082c39bf728
parenta3710efdb13d108887bdb9655f77fbab7742b48c
[MERGE] saas-3

bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
addons/website/controllers/main.py
addons/website/models/website.py
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website/static/src/js/website.tour.banner.js
addons/website/views/snippets.xml
addons/website/views/website_templates.xml
addons/website_event_sale/views/website_event_sale.xml
addons/website_sale/views/website_sale.xml