[MERGE] Forward-port of 8.0 up to d32d120
authorOlivier Dony <odo@openerp.com>
Mon, 8 Sep 2014 15:01:35 +0000 (17:01 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 8 Sep 2014 15:01:35 +0000 (17:01 +0200)
commit1d230f12222bb6b9bb21858eab2f5803caff03d0
tree50aa43cf33f4faea6e8c96a6c8f3347d0540b365
parent0b390d46624c21ff0d89088fc66d35211c68816c
parentd32d120a0ad5db2b58fd7eccbc60ea7b9eff8c18
[MERGE] Forward-port of 8.0 up to d32d120
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/xml/base.xml
addons/web/views/webclient_templates.xml
addons/website/models/ir_http.py
addons/website/views/website_templates.xml
openerp/addons/base/ir/ir_attachment.py
openerp/addons/base/ir/ir_qweb.py
openerp/addons/base/ir/ir_ui_view.py