projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f04e0c 0ac4a8f)
[MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014...
authorChristophe Simonis <chs@openerp.com>
Sat, 30 Nov 2013 13:07:25 +0000 (14:07 +0100)
committerChristophe Simonis <chs@openerp.com>
Sat, 30 Nov 2013 13:07:25 +0000 (14:07 +0100)
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht

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

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