projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa0404b c0df907)
[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Thu, 22 Nov 2012 05:10:32 +0000 (10:40 +0530)
committerAmit Patel <apa@tinyerp.com>
Thu, 22 Nov 2012 05:10:32 +0000 (10:40 +0530)
bzr revid: apa@tinyerp.com-20121122051032-wpk2r3a12v5jyknb

1  2 
addons/account/account_invoice.py patch | diff1 | diff2 | blob | history
addons/mail/static/src/js/mail_followers.js patch | diff1 | diff2 | blob | history
addons/sale/sale.py patch | diff1 | diff2 | blob | history

diff --cc addons/account/account_invoice.py
Simple merge
diff --cc addons/sale/sale.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.