projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f9302a
a7c2125
)
[MERGE] forward port of branch saas-5 up to a7c2125
author
Christophe Simonis
<chs@odoo.com>
Tue, 10 Jun 2014 11:19:55 +0000
(13:19 +0200)
committer
Christophe Simonis
<chs@odoo.com>
Tue, 10 Jun 2014 11:19:55 +0000
(13:19 +0200)
1
2
addons/website/views/website_templates.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/website/views/website_templates.xml
Simple merge