summaryrefslogtreecommitdiff
path: root/addons/mail/__init__.py
diff options
context:
space:
mode:
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>2012-08-13 15:55:19 +0530
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>2012-08-13 15:55:19 +0530
commit1bf105837ed5cad0715b20ef501e7147af87c7ef (patch)
tree7a292e7311c91e6e0acafe7359dd1e7f1d7a4cb9 /addons/mail/__init__.py
parentdae19bc174b3962088bf4b9fd0701f80ab8f8e5e (diff)
parent03e6f93fcffa7775754bf5198478b5927d8ffe1c (diff)
[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-message-sub-type-apa
bzr revid: fka@tinyerp.com-20120813102519-9h3fpqj29dse2p3m
Diffstat (limited to 'addons/mail/__init__.py')
-rw-r--r--addons/mail/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index bac92a833ff..7783faee5c3 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -20,6 +20,7 @@
##############################################################################
import mail_message_subtype
+import mail_alias
import mail_message
import mail_thread
import mail_group
@@ -29,6 +30,7 @@ import res_users
import res_partner
import report
import wizard
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: