projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3eafe0a 5ad8a9c)
merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 4 Jun 2012 09:15:13 +0000 (11:15 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 4 Jun 2012 09:15:13 +0000 (11:15 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120604085526-mkjq2s8hqwdx4fg0
bzr revid: nicolas.vanhoren@openerp.com-20120604091513-ixvdc1q6f854za8r

1  2 
addons/web/static/src/js/view_form.js patch | diff1 | diff2 | blob | history
addons/web_kanban/static/src/js/kanban.js patch | diff1 | diff2 | blob | history

diff --cc addons/web/static/src/js/view_form.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.