[MERGE] from website-al
authorChristophe Matthieu <chm@openerp.com>
Tue, 10 Sep 2013 10:01:59 +0000 (12:01 +0200)
committerChristophe Matthieu <chm@openerp.com>
Tue, 10 Sep 2013 10:01:59 +0000 (12:01 +0200)
commit5a16088b0b0477e619b97f203f7af4ec21543418
treeec7901da28006d85b292bb13a108770138e24a23
parent819eb62490ca4db08d7e787e7de4bfd8f8c7b2f6
parentbf09524def70b72059d5b7bfc1247a52a70ca9e1
[MERGE] from website-al

bzr revid: chm@openerp.com-20130910100159-xs0d8zngz4ybl0y9
addons/website/static/src/css/editor.css
addons/website/static/src/css/editor.sass
addons/website/static/src/js/website.editor.js