projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f16b61c
ba99ab5
)
[MERGE] from parent branch
author
Xavier Morel
<xmo@openerp.com>
Fri, 13 Sep 2013 14:55:30 +0000
(16:55 +0200)
committer
Xavier Morel
<xmo@openerp.com>
Fri, 13 Sep 2013 14:55:30 +0000
(16:55 +0200)
bzr revid: xmo@openerp.com-
20130913145530
-p1gm7k7ie5t3powp
1
2
addons/website/static/src/css/editor.css
patch
|
diff1
|
diff2
|
blob
|
history
addons/website/static/src/css/editor.sass
patch
|
diff1
|
diff2
|
blob
|
history
addons/website/static/src/js/website.editor.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/website/static/src/css/editor.css
Simple merge
diff --cc
addons/website/static/src/css/editor.sass
Simple merge
diff --cc
addons/website/static/src/js/website.editor.js
Simple merge
projects / odoo / odoo.git / commitdiff