git.inspyration.org Git - odoo/odoo.git/commit - addons/mail/static/src/js/mail.js

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c4a019b 3c0b65f)

author	Thibault Delavallée <tde@openerp.com>
	Wed, 22 May 2013 14:32:06 +0000 (16:32 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Wed, 22 May 2013 14:32:06 +0000 (16:32 +0200)
commit	3f5c73808421dc99520e216abd12bf9e3a1104f1
tree	84dba3fed3d754052d61972b55d128b74c931b2f	tree \| snapshot
parent	c4a019bbfddd27a46a780af5f1506e4364e2d28f	commit \| diff
parent	3c0b65f5d10785b543a67421a654ffd0244952d6	commit \| diff

[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130522110325-hos9ocph7yo9ae7w
bzr revid: tde@openerp.com-20130522143206-uv1f6lj6xsenzj6u

14 files changed:

addons/crm/crm_case_section_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_alias.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/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_features.py	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/project_demo.xml	diff1 \|	diff2 \|	blob \| history
addons/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history

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