diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-10-28 17:33:21 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-10-28 17:33:21 +0100 |
| commit | 5bb4fa2b4347a99b5c1a5722d5591c06f7032d4c (patch) | |
| tree | ba5127daf27cc553ebc8683a39b68ebec379f4e9 /addons/mass_mailing/controllers/main.py | |
| parent | 0db0f20bda410bd6601c266026363fc95b21c9c4 (diff) | |
| parent | a7ff75f94a168e26b9e9a208167b07d45dc751cb (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
Diffstat (limited to 'addons/mass_mailing/controllers/main.py')
| -rw-r--r-- | addons/mass_mailing/controllers/main.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py index 3ca238256b1..ac1531d7192 100644 --- a/addons/mass_mailing/controllers/main.py +++ b/addons/mass_mailing/controllers/main.py @@ -1,7 +1,6 @@ -import openerp.addons.web.http as http -from openerp.addons.web.http import request - +from openerp import http +from openerp.http import request class MassMailController(http.Controller): @http.route('/mail/track/<int:mail_id>/blank.gif', type='http', auth='admin') |