projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8e2cf3 8ee8b7b)
[IMP] merge with latest trunk
authorRandhir Mayatra rma-openerp <rma@tinyerp.com>
Wed, 23 Apr 2014 12:59:05 +0000 (18:29 +0530)
committerRandhir Mayatra rma-openerp <rma@tinyerp.com>
Wed, 23 Apr 2014 12:59:05 +0000 (18:29 +0530)
bzr revid: rma@tinyerp.com-20140423125905-yw05utqtg8q4r0kv

1  2 
addons/web/controllers/main.py patch | diff1 | diff2 | blob | history

diff --cc addons/web/controllers/main.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.