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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d3ba8a8 fdc6271)

author	Christophe Simonis <chs@odoo.com>
	Fri, 12 Sep 2014 16:53:48 +0000 (18:53 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Fri, 12 Sep 2014 16:53:48 +0000 (18:53 +0200)
commit	56f2b7ae0f8c958ef78da7cf466e7908abcd29c6
tree	d4e87cd25cea80059723fd61a72b3c4eaf86841a	tree \| snapshot
parent	d3ba8a840d986a224281a2844ccabcbc8c41ffd4	commit \| diff
parent	fdc62713a5ac7a4f084a911311150fc6b9fe4a21	commit \| diff

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

17 files changed:

addons/email_template/email_template.py	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.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/point_of_sale/static/src/js/models.js	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_event_sale/controllers/main.py	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/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history

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