pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,754 Commits 1 Branch 0 Tags
cde2ec003f3bc7c57c4f9a1596494de97dfbf45a
Commit Graph
5 Commits
Author SHA1 Message Date
Olivier Dony f42126df0e [MERGE] latest trunk 
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
 2011-09-06 10:08:46 +02:00
Olivier Dony 50507512cb [MERGE] latest trunk 
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.

bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
 2011-08-10 01:44:28 +02:00
Olivier Dony c996efa2fe [IMP] mail: another pass of cleanup/refactoring of mail features - finish renaming 
bzr revid: odo@openerp.com-20110722163457-7g9ngdb2p0bixcst
 2011-07-22 18:34:57 +02:00
Harry (OpenERP) 0577796333 [MERGE] merged addons trunk development branch after resolving conflicts 
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
 2011-04-21 13:31:56 +05:30
Rifakat Haradwala (Open ERP) 47a85e9f8f [IMP] mail: rename module email to mail because of parsing error 
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
 2011-04-04 15:15:52 +05:30