[merge] merge proposal soon refused
authorAntoine Huvelle <ahu@openerp.com>
Thu, 22 Dec 2011 14:16:25 +0000 (15:16 +0100)
committerAntoine Huvelle <ahu@openerp.com>
Thu, 22 Dec 2011 14:16:25 +0000 (15:16 +0100)
commit1699ae838349c3d4990a8ee9d1d3469bc89210e7
tree994cac6417f58fec6a79044930c83f37b85ae49e
parentd29dcb89c45cf065883aa668794ace34defb19b3
parente05b605dca8c8cf02fec9d94cd080822792f930f
[merge] merge proposal soon refused

bzr revid: ahu@openerp.com-20111222141625-vo57xyuhdhznnums
addons/web/static/src/css/base.css
addons/web/static/src/js/view_list.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml
addons/web_dashboard/static/src/css/dashboard.css
addons/web_dashboard/static/src/xml/web_dashboard.xml