projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
223717d
8e63d91
)
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
author
Paramjit Singh Sahota
<psa@tinyerp.com>
Fri, 30 Aug 2013 10:34:01 +0000
(16:04 +0530)
committer
Paramjit Singh Sahota
<psa@tinyerp.com>
Fri, 30 Aug 2013 10:34:01 +0000
(16:04 +0530)
bzr revid: psa@tinyerp.com-
20130830103401
-43h30myoqb1p0gcd
1
2
addons/website/static/src/xml/website.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/website/static/src/xml/website.xml
Simple merge
projects / odoo / odoo.git / commitdiff