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

author	Christophe Simonis <chs@odoo.com>
	Wed, 25 Jun 2014 10:44:13 +0000 (12:44 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Wed, 25 Jun 2014 10:44:13 +0000 (12:44 +0200)
commit	1eaa69d342e61334b04fac2943877fff1b69b287
tree	924c13e97638aa4e9e728df1dc99ca75defc1dcf	tree \| snapshot
parent	5112421a937904180f2755889fce03740ce3b93b	commit \| diff
parent	9e8e3653f2168b4f32ee08e98b3f41e8eb8474d7	commit \| diff

[MERGE] forward port of branch saas-5 up to 9e8e365

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

addons/crm_claim/crm_claim.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_list.js	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
addons/website/controllers/main.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/wizard/base_module_upgrade_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history