projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
01f3648
65583f0
)
[MERGE] upstream
author
Fabien Meghazi
<fme@openerp.com>
Tue, 14 Jan 2014 13:39:53 +0000
(14:39 +0100)
committer
Fabien Meghazi
<fme@openerp.com>
Tue, 14 Jan 2014 13:39:53 +0000
(14:39 +0100)
bzr revid: fme@openerp.com-
20140114133953
-ku7af6v3z9y7qap2
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
addons/web/static/src/js/chrome.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/static/src/xml/base.xml
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
diff --cc
addons/web/static/src/js/chrome.js
Simple merge
diff --cc
addons/web/static/src/xml/base.xml
Simple merge
projects / odoo / odoo.git / commitdiff