Merge remote-tracking branch 'odoo/master' into master-autocompletion-ged
authorGéry Debongnie <ged@odoo.com>
Fri, 27 Jun 2014 10:06:15 +0000 (12:06 +0200)
committerGéry Debongnie <ged@odoo.com>
Fri, 27 Jun 2014 10:06:15 +0000 (12:06 +0200)
commit18da121ae256d028586b4342d8ce7f3f01a3cade
treee227d6b8ca1a799b6f865cebe3f3855fb59b5e42
parent512f7acfdccd4208c9da4d95727e0d8d22889e55
parent6db8bf3def673f07cf834c762c6fc52e4d4950b4
Merge remote-tracking branch 'odoo/master' into master-autocompletion-ged
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/xml/base.xml