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: 5258252 b343ae4)

author	Thibault Delavallée <tde@openerp.com>
	Wed, 2 Oct 2013 13:54:42 +0000 (15:54 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Wed, 2 Oct 2013 13:54:42 +0000 (15:54 +0200)
commit	607de396ba46c1c4c8f4515c17bb0508022c0adc
tree	e918f0ebcd80fe5dcde970927d3e52cc04d625df	tree \| snapshot
parent	525825261bdacb497c91da5cf7446d5be667f582	commit \| diff
parent	b343ae42c63e945c13fba3bd74d9c2bd037a537d	commit \| diff

[MERGE] Sync with trunk, until revision 8927

bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt

19 files changed:

addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/event/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/event/event_view.xml	diff1 \|	diff2 \|	blob \| history
addons/im_livechat/im_livechat.py	diff1 \|	diff2 \|	blob \| history
addons/im_livechat/static/ext/static/js/livesupport.js	diff1 \|	diff2 \|	blob \| history
addons/knowledge/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_group.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/common.py	\|	diff2 \|	blob \| history
addons/point_of_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_demo.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/db.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/models.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/widgets.js	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/website_blog/views/website_blog_classic.xml	diff1 \|	\|	blob \| history

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