[MERGE] forward port of branch saas-3 up to 2f4be42
authorDenis Ledoux <dle@odoo.com>
Mon, 11 Aug 2014 13:30:37 +0000 (15:30 +0200)
committerDenis Ledoux <dle@odoo.com>
Mon, 11 Aug 2014 13:30:37 +0000 (15:30 +0200)
commit7ecaab9fe277b8442eb1bee2c8e91d4211387284
treef4fbd54a3106a3ee9c3b65c7fe51f299ebf2711f
parent576e3c776a74d6b807d60a612c643cbddcee97b3
parent2f4be42d8c6e3a6d3b46981c7e030e9e306cf646
[MERGE] forward port of branch saas-3 up to 2f4be42
addons/web/static/src/js/view_form.js
addons/web_kanban/static/src/js/kanban.js
addons/website/controllers/main.py
openerp/tools/yaml_import.py