[MERGE] fix template rendering
authorChristophe Simonis <chs@openerp.com>
Thu, 6 Feb 2014 16:38:11 +0000 (17:38 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 6 Feb 2014 16:38:11 +0000 (17:38 +0100)
commitdaace48560f6a03b9fef0a224b2c2d47a78bb7b9
treef76ab1ba0634e877dd1a4e4d5819b14101a1f668
parent297781df089945892f9d31aa049c0ecd0f5b88bc
parent2d4fb9769601a32db2ab13f448c8da6bcd86eca4
[MERGE] fix template rendering

bzr revid: chs@openerp.com-20140206163811-i43srg7hd4yqzzo3
addons/website/models/website.py