diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-07-17 10:59:25 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-07-17 10:59:25 +0200 |
| commit | 48dd55b1e8f5ef4708d161425b2648104c767ab4 (patch) | |
| tree | efdf2bc79f339c32f899d957c1cc3761ea086ca4 /addons/plugin/plugin_handler.py | |
| parent | 32d0f6bce086e10bf31f3a326503e45b0f4d9ff0 (diff) | |
[FIX] mail: fixed merge issue, forgottent conflict
bzr revid: tde@openerp.com-20130717085925-l0u2nkvz91wm5kcy
Diffstat (limited to 'addons/plugin/plugin_handler.py')
0 files changed, 0 insertions, 0 deletions