projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17b6f1b b8f5817)
[MERGE] from website-al
authorChristophe Matthieu <chm@openerp.com>
Mon, 5 Aug 2013 08:39:38 +0000 (10:39 +0200)
committerChristophe Matthieu <chm@openerp.com>
Mon, 5 Aug 2013 08:39:38 +0000 (10:39 +0200)
bzr revid: chm@openerp.com-20130805083938-xquerxe417mmvh73

1  2 
openerp/tools/qweb.py patch | diff1 | diff2 | blob | history

diff --cc openerp/tools/qweb.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.