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

author	Christophe Matthieu <chm@openerp.com>
	Fri, 26 Jul 2013 14:31:34 +0000 (16:31 +0200)
committer	Christophe Matthieu <chm@openerp.com>
	Fri, 26 Jul 2013 14:31:34 +0000 (16:31 +0200)
commit	75ff22286f2e0acf359860de0a883ae5e27cc033
tree	5eaf8e8a1f6d860eacb1c4ae83e7a8218fb6bcbd	tree \| snapshot
parent	69acb34f3eed681953e75e24eae54cca4be45930	commit \| diff
parent	34c97e980205c083f24ade2430f460b122a31c4d	commit \| diff

[MERGE] from trunk

bzr revid: chm@openerp.com-20130726143134-4vmzxqcb2d3fnwwx

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

addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/im_livechat/im_livechat.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/portal_project/tests/test_access_rights.py	diff1 \|	diff2 \|	blob \| history
addons/portal_project_issue/tests/test_access_rights.py	diff1 \|	diff2 \|	blob \| history