[MERGE] forward port of branch 7.0 up to 8e76938
authorJulien Legros <jle@odoo.com>
Thu, 23 Oct 2014 12:31:06 +0000 (14:31 +0200)
committerJulien Legros <jle@odoo.com>
Thu, 23 Oct 2014 12:31:06 +0000 (14:31 +0200)
1  2 
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass

Simple merge
Simple merge