projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c782692 1be71fd)
[MERGE] forward port of branch 7.0 up to revid 4075 chs@openerp.com-20131122170316...
authorChristophe Simonis <chs@openerp.com>
Fri, 22 Nov 2013 17:24:22 +0000 (18:24 +0100)
committerChristophe Simonis <chs@openerp.com>
Fri, 22 Nov 2013 17:24:22 +0000 (18:24 +0100)
bzr revid: chs@openerp.com-20131122131553-i22dj95bvofb7aeu
bzr revid: chs@openerp.com-20131122172422-tsd8wzqkbqknrw1w

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

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