projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c666af 7c79674)
[MERGE] merge with latest trunk
authorRandhir Mayatra rma-openerp <rma@tinyerp.com>
Mon, 7 Apr 2014 10:02:40 +0000 (15:32 +0530)
committerRandhir Mayatra rma-openerp <rma@tinyerp.com>
Mon, 7 Apr 2014 10:02:40 +0000 (15:32 +0530)
bzr revid: rma@tinyerp.com-20140407100240-vk43kganr5g0gz5i

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.