merge upstream
authorChristophe Matthieu <chm@odoo.com>
Thu, 19 Jun 2014 16:46:49 +0000 (18:46 +0200)
committerChristophe Matthieu <chm@odoo.com>
Thu, 19 Jun 2014 16:46:49 +0000 (18:46 +0200)
commit5165b52b434086b525301a5a12c09128667e6149
tree5ea73c8a6a4409cb377df7c2322c91253a0f3178
parentd89c36866e7bab7b963337fe254df10b9c0a3756
parent981362b2d843da6fd031fefabd20c99bdd47b4c6
merge upstream
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/website/static/src/css/editor.css
addons/website/static/src/css/editor.sass