diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-05 16:27:49 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-05 16:27:49 +0200 |
| commit | aba8c2b8fbfb024652f0a080c657eb2369088eda (patch) | |
| tree | bbb10ed85d2ae7f0bc1e77234fc1d24d9067de8d /addons/website/controllers | |
| parent | fc5e61b63d1357f4c89e68e108de1ade21db724f (diff) | |
| parent | 1b272a20504e16e0c170ea717f5bcf63d38e7cb5 (diff) | |
[MERGE] forward port branch 11.0 up to 1b272a20504
Diffstat (limited to 'addons/website/controllers')
| -rw-r--r-- | addons/website/controllers/main.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 62d862afe35..ead68c28274 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -18,8 +18,9 @@ from odoo import http, models, fields, _ from odoo.http import request from odoo.tools import pycompat, OrderedSet from odoo.addons.http_routing.models.ir_http import slug, _guess_mimetype -from odoo.addons.web.controllers.main import WebClient, Binary, Home +from odoo.addons.web.controllers.main import WebClient, Binary from odoo.addons.portal.controllers.portal import pager as portal_pager +from odoo.addons.portal.controllers.web import Home logger = logging.getLogger(__name__) |