diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-03-23 12:11:39 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-03-23 12:11:39 +0100 |
| commit | 42e3ed9ed3687125fac499aade93fc0d89962fdb (patch) | |
| tree | 0c5e3c886b6db5d34de73b24d48d699160c13ab4 /addons/website/controllers/main.py | |
| parent | 2abc2ceee005cf03ac0dff240898466b1c439738 (diff) | |
| parent | 0a1de99731692b3d861f6626eae2bc5b35df8b16 (diff) | |
[MERGE] forward port of branch saas-6 up to 0a1de99
Diffstat (limited to 'addons/website/controllers/main.py')
| -rw-r--r-- | addons/website/controllers/main.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index a6a2e4092a5..500c93104e6 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -379,7 +379,6 @@ class Website(openerp.addons.web.controllers.main.Home): #------------------------------------------------------ class WebsiteBinary(openerp.http.Controller): @http.route([ - '/website/image', '/website/image/<xmlid>', '/website/image/<xmlid>/<int:width>x<int:height>', '/website/image/<xmlid>/<field>', |