projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e53f66d 6b84615)
[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 13:38:13 +0000 (15:38 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 13:38:13 +0000 (15:38 +0200)
bzr revid: tde@openerp.com-20140411133813-4rj4de6dlzna5g5s

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.