projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91d7016 96231a7)
[MERGE]Trunk.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Thu, 13 Dec 2012 12:36:54 +0000 (18:06 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Thu, 13 Dec 2012 12:36:54 +0000 (18:06 +0530)
bzr revid: vme@tinyerp.com-20121213123654-q62x4vdig4tkdton

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.