projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4606fe3 00f7fbe)
[IMP]conflicts resolved
authorKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Tue, 20 Mar 2012 10:38:46 +0000 (16:08 +0530)
committerKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Tue, 20 Mar 2012 10:38:46 +0000 (16:08 +0530)
commit7ecc59bde905794d8d28939731d5adc7756fa154
treea8c0eb18678a3206eb20dacff59a174ad33b0d26tree | snapshot
parent4606fe32b7729583228124f8a29f6718eeef9002commit | diff
parent00f7fbe5504f7a1b2783072f4e7b7f542fc08017commit | diff
[IMP]conflicts resolved

bzr revid: kbh@tinyerp.com-20120320103846-gt5dalg2tejw98lv
addons/event/static/src/css/event.css diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.