projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd99c96 9bc57fd)
[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 14 Mar 2014 16:21:24 +0000 (17:21 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 14 Mar 2014 16:21:24 +0000 (17:21 +0100)
bzr revid: tde@openerp.com-20140314162124-fn8f9ne80skha19h

1  2 
addons/email_template/wizard/mail_compose_message.py patch | diff1 | diff2 | blob | history
addons/mail/mail_message.py patch | diff1 | diff2 | blob | history
addons/mail/wizard/mail_compose_message.py patch | diff1 | diff2 | blob | history

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