projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6f2b04 57505a1)
[MERGE]: with main
authorajay javiya (OpenERP) <aja@tinyerp.com>
Mon, 20 Jan 2014 05:14:07 +0000 (10:44 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Mon, 20 Jan 2014 05:14:07 +0000 (10:44 +0530)
bzr revid: aja@tinyerp.com-20140120051407-qor80rgyq7ll4xwp

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.