[MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything.
[odoo/odoo.git] / addons / mail / wizard /
drwxr-xr-x   ..
-rw-r--r-- 1075 __init__.py
-rw-r--r-- 4160 invite.py
-rw-r--r-- 1240 invite_view.xml
-rw-r--r-- 14729 mail_compose_message.py
-rw-r--r-- 4287 mail_compose_message_view.xml