[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 24 Jan 2012 15:22:39 +0000 (16:22 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 24 Jan 2012 15:22:39 +0000 (16:22 +0100)
commit31cdf276a2eb61195f94f50ce4618a8249dc3aad
tree573a79b28d5ac6d257334707007015a44201fe5e
parent2b1218b94c3f80f1ca99751f03fbd62b505e8111
parentc044b704295345d7cbd6fb57cb54c8ad3addcd80
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120124152239-yjtsn0j2yt4gif5e
addons/web/static/src/js/views.js
addons/web_gantt/static/src/js/gantt.js