projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bccafbd
d169f4a
)
[MERGE] trunk
author
openerp-sle
<openerp-sle@openerp-sle.home>
Sun, 16 Feb 2014 10:36:09 +0000
(11:36 +0100)
committer
openerp-sle
<openerp-sle@openerp-sle.home>
Sun, 16 Feb 2014 10:36:09 +0000
(11:36 +0100)
bzr revid: openerp-sle@openerp-sle.home-
20140216103609
-ihf3bz4nf4rds5ue
1
2
addons/website/views/website_templates.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/website/views/website_templates.xml
Simple merge