Merged trunk-website-al
authorddm <ddm@openerp.com>
Tue, 10 Sep 2013 10:33:53 +0000 (12:33 +0200)
committerddm <ddm@openerp.com>
Tue, 10 Sep 2013 10:33:53 +0000 (12:33 +0200)
commita5e1ed7800ee76459fee39db6cb3b7033eceba63
tree78d94dc2dbf53cc44e4715dea8a434472ac55651
parentc4f52f12cdb224c070cf5fe8a12b9894ecb8ae65
parent45727ab601767913d1f3f909e973281dcaa91ea5
Merged trunk-website-al

bzr revid: ddm@openerp.com-20130910103353-j5sbly1v6m93qiel
addons/website/static/src/css/editor.css
addons/website/static/src/css/editor.sass
addons/website/static/src/js/website.editor.js
addons/website/views/views.xml