projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89ba499 aebb235)
[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Tue, 15 Jan 2013 11:27:53 +0000 (12:27 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 15 Jan 2013 11:27:53 +0000 (12:27 +0100)
bzr revid: tde@openerp.com-20130115112753-p7ams94qeayg0her

1  2 
addons/mail/res_users.py patch | diff1 | diff2 | blob | history

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