Skip to content
Snippets Groups Projects
Commit e862ff70 authored by Christophe Simonis's avatar Christophe Simonis
Browse files

[MERGE] forward port of branch saas-5 up to 4cb5381d

Conflicts:
	openerp/addons/base/module/wizard/base_module_upgrade_view.xml
parents 0e595c41 4cb5381d
No related branches found
No related tags found
Loading
Showing with 146 additions and 48 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment