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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9c0964c 7eab880)

author	Christophe Simonis <chs@odoo.com>
	Mon, 15 Sep 2014 11:52:44 +0000 (13:52 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Mon, 15 Sep 2014 12:00:02 +0000 (14:00 +0200)
commit	780dd9891f5783fd07a075a445314df912d0a88c
tree	f84fd550af3b0e0de1e41328b498c9593355b8f8	tree \| snapshot
parent	9c0964ccadadb7358ac0184effdf3c836a04f7ce	commit \| diff
parent	7eab880660da4a1a9cc25619f2314bdde5062091	commit \| diff

[MERGE] forward port of branch saas-5 up to 7eab880

18 files changed:

addons/email_template/email_template.py	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_ro/res_partner.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_repair/mrp_repair.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/data.js	diff1 \|	diff2 \|	blob \| history
addons/website_sale/static/src/js/website_sale.js	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	\|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history

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