projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9b3bc55 0d4d9af)
[MERGE] Sync with trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 25 Mar 2014 15:29:35 +0000 (16:29 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 25 Mar 2014 15:29:35 +0000 (16:29 +0100)
commit6e25b1fc3f8df1e853f9eb5fbb4458baf0df4802
tree8a12993d1c053c799dfec533de0ec2b3ae516a6etree | snapshot
parent9b3bc5539821bb18622447e657b8e2b0397638d9commit | diff
parent0d4d9af5f4b7ca695e33af370848350b437c132ecommit | diff
[MERGE] Sync with trunk

bzr revid: rim@openerp.com-20140325152935-hifgmzdl63yhmkll
addons/website/views/website_templates.xml diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.