projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 939a344 9e85aa3)
[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 4 Oct 2013 08:50:39 +0000 (10:50 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 4 Oct 2013 08:50:39 +0000 (10:50 +0200)
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k

1  2 
addons/mail/static/src/js/mail.js patch | diff1 | diff2 | blob | history
addons/portal/portal_data.xml patch | diff1 | diff2 | blob | history

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