projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d7b33f1
d706adb
)
[MERGE] Forward-port 8.0 up to d706adb
author
Olivier Dony
<odo@openerp.com>
Sat, 2 Aug 2014 19:13:41 +0000
(21:13 +0200)
committer
Olivier Dony
<odo@openerp.com>
Sun, 3 Aug 2014 23:47:07 +0000
(
01:47
+0200)
1
2
addons/website/views/website_templates.xml
patch
|
diff1
|
diff2
|
blob
|
history
openerp/addons/base/res/res_partner_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/website/views/website_templates.xml
Simple merge
diff --cc
openerp/addons/base/res/res_partner_view.xml
Simple merge
projects / odoo / odoo.git / commitdiff