git.inspyration.org Git - odoo/odoo.git/commit

author	Richard Mathot (OpenERP) <rim@openerp.com>
	Tue, 7 Jan 2014 09:44:28 +0000 (10:44 +0100)
committer	Richard Mathot (OpenERP) <rim@openerp.com>
	Tue, 7 Jan 2014 09:44:28 +0000 (10:44 +0100)
commit	0be1ecb053aaea754a94ca38b6e6880316650cc3
tree	58436445431712a65d7ad1686e3c61045b42b306	tree \| snapshot
parent	c2b21f9a509e5c11eeccf400affadd4d37a77272	commit \| diff
parent	b6517bd5bd1bdfd038607f54885e1190508695b3	commit \| diff

[MERGE] Merge parents

bzr revid: rim@openerp.com-20140107094428-h59k5y31u28tjsfe

Unnamed repository; edit this file 'description' to name the repository.

addons/hr_evaluation/hr_evaluation.py	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment.py	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment_data.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment_view.xml	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history