projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c96c392 e03849b)
[MER] Merge from openerp-web.
authorJiten (OpenERP) <jra@tinyerp.com>
Mon, 29 Aug 2011 05:50:35 +0000 (11:20 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Mon, 29 Aug 2011 05:50:35 +0000 (11:20 +0530)
bzr revid: jra@tinyerp.com-20110829055035-861s4xm5hp90ecep

1  2 
addons/base/static/src/js/data.js patch | diff1 | diff2 | blob | history

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