ajay javiya (OpenERP) 138f5d7f32 [MERGE] : with trunk and resolve conflicts ...

bzr revid: aja@tinyerp.com-20140401052801-4483i0z0ivmrwsbn

2014-04-01 10:58:01 +05:30

..

description

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

2014-02-28 12:06:37 +01:00

lib

[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6

2014-03-11 15:52:05 +01:00

src

[MERGE] : with trunk and resolve conflicts

2014-04-01 10:58:01 +05:30