projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39e4f46 b484da7)
[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 19 Mar 2014 12:42:46 +0000 (18:12 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 19 Mar 2014 12:42:46 +0000 (18:12 +0530)
bzr revid: tpa@tinyerp.com-20140319124246-1v3nxprd7xdlnrsk

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.