projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3d8952b
fd43cec
)
[MERGE] : with trunk
author
ajay javiya (OpenERP)
<aja@tinyerp.com>
Mon, 31 Mar 2014 04:19:56 +0000
(09:49 +0530)
committer
ajay javiya (OpenERP)
<aja@tinyerp.com>
Mon, 31 Mar 2014 04:19:56 +0000
(09:49 +0530)
bzr revid: aja@tinyerp.com-
20140331041956
-0ots0gkn1d4ffudq
1
2
addons/website/static/src/css/website.css
patch
|
diff1
|
diff2
|
blob
|
history
addons/website/static/src/css/website.sass
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/website/static/src/css/website.css
Simple merge
diff --cc
addons/website/static/src/css/website.sass
Simple merge