Merge remote-tracking branch 'odoo/master' into master-autocompletion-ged
authorGéry Debongnie <ged@odoo.com>
Fri, 27 Jun 2014 13:06:45 +0000 (15:06 +0200)
committerGéry Debongnie <ged@odoo.com>
Fri, 27 Jun 2014 13:06:45 +0000 (15:06 +0200)
commit2ae0e6b7c342b8097cdb9045fda83cd8955cc95b
tree22f834be6170615c7a945ea31f0b6aa24bb9f135
parente556fd735e66dc8d769be0bb3b7ea23777c24116
parentb36f5d6d33260637013ae339525353c2fb2b1ef5
Merge remote-tracking branch 'odoo/master' into master-autocompletion-ged
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass