diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-22 15:36:10 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-22 15:36:10 +0200 |
| commit | e862ff7033dd001a84d7e0a192d0da7b11384bd9 (patch) | |
| tree | 349a80be398aeb306d443239c88e522f66d43e39 /addons/mail/mail_message_view.xml | |
| parent | 0e595c418612d8236d63ec70c2f8dccb7cff3407 (diff) | |
| parent | 4cb5381deecdf28d2a0f6b1e7f4b16a611ec9de9 (diff) | |
[MERGE] forward port of branch saas-5 up to 4cb5381
Conflicts:
openerp/addons/base/module/wizard/base_module_upgrade_view.xml
Diffstat (limited to 'addons/mail/mail_message_view.xml')
0 files changed, 0 insertions, 0 deletions