projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02e8d1a 8e76938)
Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Thu, 23 Oct 2014 21:42:36 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Thu, 23 Oct 2014 21:42:36 +0000 (23:42 +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.