diff options
| author | Josse Colpaert <jco@odoo.com> | 2014-06-17 16:23:44 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@odoo.com> | 2014-06-17 16:23:44 +0200 |
| commit | 6b63d40145ab0816e8e45626efa86c4891072618 (patch) | |
| tree | c142b846c8e1c41ce87ff7aa598fb6fc3fc51d52 /addons/plugin_thunderbird/static/thunderbird_plugin/defaults | |
| parent | aef4d9b163fd8d985817b3379ff7dccc3b6b92a3 (diff) | |
| parent | 02677579d2171f38b228e13b0edbef09d4e4e4bb (diff) | |
[MERGE] Merge from master and resolve conflict
Diffstat (limited to 'addons/plugin_thunderbird/static/thunderbird_plugin/defaults')
0 files changed, 0 insertions, 0 deletions