[MERGE] from trunk
authorchm@openerp.com <>
Mon, 31 Mar 2014 12:16:54 +0000 (14:16 +0200)
committerchm@openerp.com <>
Mon, 31 Mar 2014 12:16:54 +0000 (14:16 +0200)
commit880ac90e1b8e0b1a83c4180f6d6a757c5b7fc1e8
tree8a7a5c6fc1e60bf2fe702cf8eb0808c970c2ae49
parent655142b04b32d48d29540552a7ebd9f20ef38856
parentfd43cecbdadcffee2be2ff078bd32a4521ad9574
[MERGE] from trunk

bzr revid: chm@openerp.com-20140331121654-jsdotezdyi9qwmeb
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website/static/src/js/website.editor.js
addons/website/views/snippets.xml
addons/website/views/website_templates.xml