summaryrefslogtreecommitdiff
path: root/addons/mail/__init__.py
diff options
context:
space:
mode:
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-08-08 10:50:23 +0530
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-08-08 10:50:23 +0530
commit0e77a7cbda6ea1e7500c42b84f741c5ecbd48a4e (patch)
treeb53aa7bf34f0c84b3bde7ba7b5bbad9d710a9bd2 /addons/mail/__init__.py
parent1da7ac2448a5e29bb43994286d3fbb8d90576d54 (diff)
parentd58b36a8a36dcda196c3ed6d5b7421102ee33547 (diff)
[MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120808052023-i87gopbxesqwfm0q
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 805c27386f3..cbd477f55e6 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -19,6 +19,7 @@
#
##############################################################################
+import mail_alias
import mail_message
import mail_thread
import mail_group
@@ -28,6 +29,7 @@ import res_users
import res_partner
import report
import wizard
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: