projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4da7cba acbc7cd)
[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 27 Mar 2013 12:09:28 +0000 (13:09 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 27 Mar 2013 12:09:28 +0000 (13:09 +0100)
bzr revid: tpa@tinyerp.com-20130322065219-vjy2nwjg97xhv16n
bzr revid: tde@openerp.com-20130327120928-o26n6vksq6hainq2

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

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