summaryrefslogtreecommitdiff
path: root/addons/mail/__init__.py
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-12-11 17:14:58 +0100
committerThibault Delavallée <tde@openerp.com>2012-12-11 17:14:58 +0100
commitb541e7ce6477e2567eecbaa96a8cfeca02d3868d (patch)
tree6168c91acf958998eed50b88a937f32bc4146f7b /addons/mail/__init__.py
parent023783324077937517a8fab476a3a5dbee5ed535 (diff)
parent09030aa8d4c87d02e101af91e276ebeaacd43e91 (diff)
[MERGE] Sync with trunk. Cleaned a bit things lastly added in trunk/mail/tests.
bzr revid: tde@openerp.com-20121211161458-d7wv4lnkvs9s7srj
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 7c82bfde78d..26578e19af1 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -33,5 +33,6 @@ import wizard
import res_config
import mail_group_menu
import update
+import controllers
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: