summaryrefslogtreecommitdiff
path: root/addons/mail/__init__.py
diff options
context:
space:
mode:
authorArnaud Pineux <api@openerp.com>2012-12-11 16:33:52 +0100
committerArnaud Pineux <api@openerp.com>2012-12-11 16:33:52 +0100
commitd288b45bb3e192146dfd2fe40d840c8c23a79f74 (patch)
tree55f0fed474aee380ecd2d6a544024763bd533a20 /addons/mail/__init__.py
parentdd94a6b00a129c506299ec7e0b5739f5e9668a24 (diff)
parentc70f05cc778435a069d258a82b8b2870e8565922 (diff)
[MERGE] with trunk
bzr revid: api@openerp.com-20121211153352-l1ikpqgz8cxmuuu0
Diffstat (limited to 'addons/mail/__init__.py')
-rw-r--r--addons/mail/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index b34993ffd32..b759a08d778 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -35,5 +35,6 @@ import wizard
import res_config
import mail_group_menu
import update
+import controllers
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: