[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Tue, 22 May 2012 08:13:12 +0000 (10:13 +0200)
committerAntony Lesuisse <al@openerp.com>
Tue, 22 May 2012 08:13:12 +0000 (10:13 +0200)
commit2642ffc27aadc0c30f34f40657998094cafcab2a
treee9f3dda1e8463bba9547cd6caf718a35206843cf
parent3e5f595f17a26d0c3cf93926c0bae86df464fa16
parentca6283de8efc7d790fe1d6d843ec264777b3ae47
[MERGE] trunk

bzr revid: al@openerp.com-20120522081312-7fsq4o5eod2mhxt4
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web_kanban/static/src/css/kanban.css
addons/web_kanban/static/src/xml/web_kanban.xml