projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d545a4 ab154e8)
[MERGE] Merge lp:openerp-web/7.0.
authorbth <bth@bth-laptop>
Tue, 26 Mar 2013 09:36:43 +0000 (15:06 +0530)
committerbth <bth@bth-laptop>
Tue, 26 Mar 2013 09:36:43 +0000 (15:06 +0530)
bzr revid: bth@bth-laptop-20130326093643-746n0kzeu3nlwfe2

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.