[MERGE] forward port of branch 8.0 up to a5419ca
authorChristophe Simonis <chs@odoo.com>
Tue, 15 Jul 2014 09:23:47 +0000 (11:23 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 15 Jul 2014 09:23:47 +0000 (11:23 +0200)
commitb7ba49825a85d2db483c7e31f2ab5fa10fc01390
tree0ae2a6b8f576bd070e2a64fe3b1792c34288377c
parentbcfa4c8e7ca4f8fb3b577e32eca9f3c0e8f99190
parenta5419ca800877d686b0d8eecf88b0643cc98fd2d
[MERGE] forward port of branch 8.0 up to a5419ca
addons/website/static/src/css/editor.css
addons/website/static/src/css/editor.sass
openerp/addons/base/ir/ir_qweb.py