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

author	Christophe Simonis <chs@openerp.com>
	Thu, 10 Apr 2014 11:04:24 +0000 (13:04 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Thu, 10 Apr 2014 11:04:24 +0000 (13:04 +0200)
commit	3a7e003656910d6a8a552684029a47816a137fb5
tree	707815e1d9698d15f84ef649e50b918d9530265f	tree \| snapshot
parent	e521085fff15e06fea09353c0a531b93874a25e0	commit \| diff
parent	bd7804272b5b161b1e523570b750df619795766c	commit \| diff

[MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck

bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni

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

RSS Atom

addons/account_asset/account_asset.py	diff1 \|	diff2 \|	blob \| history
addons/auth_oauth/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.snippets.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history