projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc87989 80160ef)
[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 10 Apr 2014 06:16:30 +0000 (11:46 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 10 Apr 2014 06:16:30 +0000 (11:46 +0530)
bzr revid: tpa@tinyerp.com-20140410061630-k5x4rl2k6most05b

1  2 
addons/website/views/snippets.xml patch | diff1 | diff2 | blob | history

diff --cc addons/website/views/snippets.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.