diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-10-21 14:59:56 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-10-21 14:59:56 +0200 |
| commit | a42167d085e8c4989412c39ec4e21685ebd93cd2 (patch) | |
| tree | fc8cf942fe689de94aec631d5b8d7365693de5d0 /addons/web/controllers | |
| parent | d822766296fed8f72d3168c675d4cf0b89e73f0c (diff) | |
| parent | 262eb662de489d98b76dece7305b594399161014 (diff) | |
[MERGE] forward port of branch 8.0 up to 262eb66
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 1bdaa3ed5f7..332151ec56e 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1210,7 +1210,7 @@ class Binary(http.Controller): '/web/binary/company_logo', '/logo', '/logo.png', - ], type='http', auth="none") + ], type='http', auth="none", cors="*") def company_logo(self, dbname=None, **kw): imgname = 'logo.png' placeholder = functools.partial(get_module_resource, 'web', 'static', 'src', 'img') |