projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a90523 dcdf729)
[MERGE] from trunk
authorchm@openerp.com <>
Tue, 8 Apr 2014 13:24:12 +0000 (15:24 +0200)
committerchm@openerp.com <>
Tue, 8 Apr 2014 13:24:12 +0000 (15:24 +0200)
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj

1  2 
addons/website/controllers/main.py patch | diff1 | diff2 | blob | history
addons/website/views/snippets.xml patch | diff1 | diff2 | blob | history
addons/website/views/website_templates.xml patch | diff1 | diff2 | blob | history

diff --cc addons/website/controllers/main.py
Simple merge
diff --cc addons/website/views/snippets.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.