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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ff37d0e d24b67e)

author	Christophe Matthieu <chm@openerp.com>
	Fri, 21 Feb 2014 09:43:43 +0000 (10:43 +0100)
committer	Christophe Matthieu <chm@openerp.com>
	Fri, 21 Feb 2014 09:43:43 +0000 (10:43 +0100)
commit	bfeb2b963151c36544bc884175be4ef5e97334ec
tree	bfba526303cb90aca4806a9a24a067852b8344b2	tree \| snapshot
parent	ff37d0ebcaed01b628be188c4b0a29810765d18c	commit \| diff
parent	d24b67ed3ec568e3eb5b4296519e28a2721314b2	commit \| diff

[MERGE] from trunk

bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x

13 files changed:

addons/website/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/website/data/data.xml	diff1 \|	\|	blob \| history
addons/website/data/demo.xml	diff1 \|	\|	blob \| history
addons/website/models/ir_http.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/website.py	diff1 \|	diff2 \|	blob \| history
addons/website_event_sale/views/website_event_sale.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/data/data.xml	diff1 \|	\|	blob \| history
addons/website_sale/data/demo.xml	diff1 \|	\|	blob \| history
addons/website_sale/static/src/js/website_sale.js	diff1 \|	diff2 \|	blob \| history
addons/website_sale/tests/test_sale_process.py	diff1 \|	\|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	\|	blob \| history

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