git.inspyration.org Git - odoo/odoo.git/commit - addons/hr_recruitment/hr_recruitment_view.xml

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f529de5 57505a1)

author	Richard Mathot (OpenERP) <rim@openerp.com>
	Mon, 20 Jan 2014 09:25:25 +0000 (10:25 +0100)
committer	Richard Mathot (OpenERP) <rim@openerp.com>
	Mon, 20 Jan 2014 09:25:25 +0000 (10:25 +0100)
commit	73da643cd3675ba99a08f746ba8932d98a03f2a8
tree	59f172036a80016ef7d2504027da0fb485af8b1e	tree \| snapshot
parent	f529de5625f318f01db5c9a99c66b905caad7e5a	commit \| diff
parent	57505a1b2477110976c7fc69f5e3a29f4d064651	commit \| diff

[MERGE] Correct merge of parents

bzr revid: rim@openerp.com-20140120092525-k4k8rxvh304tvy0i

addons/calendar/__openerp__.py	\|	diff2 \|	blob \| history
addons/email_template/email_template.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/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/website.py	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.snippets.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/data/website_sale_data.xml	diff1 \|	diff2 \|	blob \| history

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