[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 14 May 2012 15:52:55 +0000 (17:52 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 14 May 2012 15:52:55 +0000 (17:52 +0200)
commit163716271518eb887d37dbc16da64bf139a60cae
tree4a93466434e91ff7b0acfe8a5a0fe80774dfed13
parent0a1ce4c4daab076130d86f612f8add182b8fc85d
parent0dcb2f423314d682ee638c3d674d973b2e7d6538
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120514155255-uac84np8j1l6v600
addons/web/static/src/js/view_form.js
addons/web_kanban/static/src/js/kanban.js
addons/web_kanban/static/src/xml/web_kanban.xml