projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7945d4b c2e7a69)
[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 25 Mar 2014 09:02:09 +0000 (10:02 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 25 Mar 2014 09:02:09 +0000 (10:02 +0100)
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu

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

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