git.inspyration.org Git - odoo/odoo.git/commit

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eb6bf4d db75994)

author	Christophe Simonis <chs@odoo.com>
	Tue, 14 Oct 2014 13:13:14 +0000 (15:13 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Tue, 14 Oct 2014 13:13:14 +0000 (15:13 +0200)
commit	2e3f59181d7194985bb12ef6327b3070ab34cfd4
tree	49e14ff03924861d6f6934c40ff02737425cdd42	tree \| snapshot
parent	eb6bf4dd86de0ef0a12124ae78d25c8918611c28	commit \| diff
parent	db759948ffdda5f73eaa989a6b14f291b9a8f9b8	commit \| diff

[MERGE] forward port of branch saas-3 up to db75994

13 files changed:

addons/account/account_bank_statement.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/email_template.py	diff1 \|	diff2 \|	blob \| history
addons/gamification/models/badge.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_lu/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_gateway.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/website_membership/views/website_membership.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history

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