diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2012-09-24 15:03:35 +0200 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2012-09-24 15:03:35 +0200 |
| commit | a9d4bf30bb55acf889538ab715dba1c682d2d38a (patch) | |
| tree | 7182a4cf21f4e16fa94d6dc0bd1c94a04b923c15 /addons/plugin_thunderbird/static/thunderbird_plugin/components/xml-rpc.xpt | |
| parent | 3d2607669f964f0ab5b1acdf1a548061a3595e7d (diff) | |
[MERGE]removed some conflicts in view
bzr revid: csn@openerp.com-20120924130335-vvkhdz9jexcnsqrq
Diffstat (limited to 'addons/plugin_thunderbird/static/thunderbird_plugin/components/xml-rpc.xpt')
0 files changed, 0 insertions, 0 deletions