projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 333315a fd43cec)
[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 31 Mar 2014 12:34:25 +0000 (18:04 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 31 Mar 2014 12:34:25 +0000 (18:04 +0530)
bzr revid: tpa@tinyerp.com-20140331123425-xrkr9rjk2y72i0zd

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.