projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3be6d4e 2966f95)
[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 29 May 2012 12:52:27 +0000 (18:22 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 29 May 2012 12:52:27 +0000 (18:22 +0530)
bzr revid: mma@tinyerp.com-20120529125227-gdu1kao0kjcxviv8

1  2 
addons/hr_holidays/hr_holidays.py patch | diff1 | diff2 | blob | history
addons/hr_holidays/hr_holidays_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/hr_holidays/hr_holidays.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.