projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc9149f 4d7a24e)
merge upstream
authorChristophe Simonis <chs@openerp.com>
Tue, 15 Nov 2011 17:00:45 +0000 (18:00 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 15 Nov 2011 17:00:45 +0000 (18:00 +0100)
bzr revid: chs@openerp.com-20111115170045-gkwow6acpskbl9yi

1  2 
addons/web/static/src/xml/base.xml patch | diff1 | diff2 | blob | history

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