projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e556fd7 b36f5d6)
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)
1  2 
addons/web/static/src/css/base.css patch | diff1 | diff2 | blob | history
addons/web/static/src/css/base.sass patch | diff1 | diff2 | blob | history

diff --cc addons/web/static/src/css/base.css
Simple merge
diff --cc addons/web/static/src/css/base.sass
Simple merge
Unnamed repository; edit this file 'description' to name the repository.