diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-08-15 21:56:52 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-08-15 21:56:52 +0200 |
| commit | 61274acd896f72e6bec98deca8faa93d9895b118 (patch) | |
| tree | cd839020bde7def97753e5dd890d1012dde456b7 /addons/mail/__init__.py | |
| parent | a6482fe07c57805976529eebd48225b060a9a49c (diff) | |
| parent | 9958acdc3286f761b6ce76142598d628736a5540 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120815195652-839w3fyumomq0ubf
Diffstat (limited to 'addons/mail/__init__.py')
| -rw-r--r-- | addons/mail/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py index 7da72f95fac..289b9080fe7 100644 --- a/addons/mail/__init__.py +++ b/addons/mail/__init__.py @@ -25,8 +25,8 @@ import mail_followers import mail_thread import mail_group import ir_needaction -import res_users import res_partner +import res_users import report import wizard import res_config |