projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: acb1156 0c1bcad)
[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 9 Nov 2012 09:44:44 +0000 (10:44 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 9 Nov 2012 09:44:44 +0000 (10:44 +0100)
bzr revid: tde@openerp.com-20121108164753-mso6bdwoc0ihn7sk
bzr revid: tde@openerp.com-20121109094444-5vw7aojazupnudy6

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

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