[MERGE] trunk-website-al
authorddm <ddm@openerp.com>
Wed, 2 Oct 2013 08:53:38 +0000 (10:53 +0200)
committerddm <ddm@openerp.com>
Wed, 2 Oct 2013 08:53:38 +0000 (10:53 +0200)
commit5f7004c296d2ef1adaad12a71ebdc97d9acbdc83
tree53a4896d27b41cf246eb3925811dc5ef102cb941
parent0c2d204bb16b08bba3e5e7a196b64606214752e4
parent86159fe4b054b475c2db8007986e0881cc1ad5d2
[MERGE] trunk-website-al

bzr revid: ddm@openerp.com-20131002085338-8jw3dkqtq842nwhe
addons/website/static/src/css/editor.css
addons/website/static/src/css/editor.sass
addons/website/views/views.xml