summaryrefslogtreecommitdiff
path: root/addons/mail/__init__.py
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@openerp.com>2012-08-15 20:57:13 +0200
committerFabien Pinckaers <fp@openerp.com>2012-08-15 20:57:13 +0200
commitd820e866ee2ce0a69a268c0302cbbeb45e5b0f50 (patch)
treec3e88ba65e7990d5306c87c49c23431100bb4310 /addons/mail/__init__.py
parenta4f9b6ca0971aa5aca6fa30342e6acb950f42c3b (diff)
parent50275e9ec945ba6865a09e9cd708793018bed0dd (diff)
[MERGE] trunk
bzr revid: fp@openerp.com-20120815185713-82zylb0yqqgs008y
Diffstat (limited to 'addons/mail/__init__.py')
-rw-r--r--addons/mail/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 9c1f0d70f6f..54e20a6a9ef 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -25,8 +25,8 @@ import mail_mail
import mail_thread
import mail_group
import mail_subscription
-import res_users
import res_partner
+import res_users
import report
import wizard
import res_config