projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
65736e0
4a29752
)
[IMP] openerpframework moved in common asset bundle
author
Fabien Meghazi
<fme@openerp.com>
Tue, 13 May 2014 08:18:31 +0000
(10:18 +0200)
committer
Fabien Meghazi
<fme@openerp.com>
Tue, 13 May 2014 08:18:31 +0000
(10:18 +0200)
1
2
addons/website/views/website_templates.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/website/views/website_templates.xml
Simple merge