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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f0ef8ac 5ceded9)

author	Olivier Dony <odo@openerp.com>
	Fri, 4 Jul 2014 23:28:19 +0000 (01:28 +0200)
committer	Olivier Dony <odo@openerp.com>
	Fri, 4 Jul 2014 23:28:19 +0000 (01:28 +0200)
commit	d9cda97cf47f78bff309aff2e6adff5808f9734d
tree	3bbba24b15b7d0901d5bf82fed3b1dc07f72c6b3	tree \| snapshot
parent	f0ef8ac446115c0cb40a07a3792095c76d45c8e2	commit \| diff
parent	5ceded9d69b3c261e501500e760b9b345bb77ecc	commit \| diff

[MERGE] Forward-port saas-4 up to 5ceded9

13 files changed:

addons/auth_oauth/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/xml/mail.xml	diff1 \|	diff2 \|	blob \| history
addons/mass_mailing/models/mass_mailing.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_http.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/website.py	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_crm/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_crm_partner_assign/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_customer/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_event/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_membership/controllers/main.py	diff1 \|	diff2 \|	blob \| history

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