projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffe9398 7651b8f)
[MERGE]Merge with Parent
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Mon, 20 Jan 2014 12:28:59 +0000 (17:28 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Mon, 20 Jan 2014 12:28:59 +0000 (17:28 +0500)
bzr revid: pza@tinyerp.com-20140120122859-ody7gvh40e3ey0q2

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.