git.inspyration.org Git - odoo/odoo.git/commit - addons/crm/crm.py

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3f5c738 43d08b8)

author	Thibault Delavallée <tde@openerp.com>
	Wed, 12 Jun 2013 12:34:29 +0000 (14:34 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Wed, 12 Jun 2013 12:34:29 +0000 (14:34 +0200)
commit	fc44f25d3a7c0113b658f1020c509a7b4a3fe442
tree	33833baa2d37612a5cd1f1cf50ef026b08669f15	tree \| snapshot
parent	3f5c73808421dc99520e216abd12bf9e3a1104f1	commit \| diff
parent	43d08b898fc3a5c5d5eaec140e7acd3b7e7faf43	commit \| diff

[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130612123429-a4mp0wiicdhlvk0m

17 files changed:

addons/crm/crm.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_case_section_view.xml	diff1 \|	diff2 \|	blob \| history
addons/event/event_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr/hr_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment.py	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_group.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/res_users.py	diff1 \|	diff2 \|	blob \| history
addons/mail/res_users_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/css/mail.css	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_gateway.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue_view.xml	diff1 \|	diff2 \|	blob \| history

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