projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21cf711 ce41f3a)
[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Thu, 28 Jun 2012 14:41:13 +0000 (16:41 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Thu, 28 Jun 2012 14:41:13 +0000 (16:41 +0200)
bzr revid: abo@openerp.com-20120628144113-fgmi7rxfabljiyio

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

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