summaryrefslogtreecommitdiff
path: root/addons/mail/__init__.py
diff options
context:
space:
mode:
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-08-30 16:54:26 +0530
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-08-30 16:54:26 +0530
commit91c022497bb07f1c951fe6c2c1883c5b8bde0325 (patch)
tree89e7b4ecd507441990b1de79741e5e7c01b76cd4 /addons/mail/__init__.py
parent253325f48822e2a61a3a38d2f3e22346f494ae35 (diff)
parentd8c65aa88eb9f779941feae45955fa09aaf8ce11 (diff)
[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-mail-cleaning-fp and done changes as needed
bzr revid: sgo@tinyerp.com-20120830112426-15b9jere67yyoa3q
Diffstat (limited to 'addons/mail/__init__.py')
-rw-r--r--addons/mail/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 3f0b618b795..9c51853f865 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -21,11 +21,11 @@
import mail_message_subtype
import mail_alias
-import mail_message
import mail_followers
+import mail_message
+import mail_mail
import mail_thread
import mail_group
-import ir_needaction
import res_partner
import res_users
import report