diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-05-26 10:06:31 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-05-26 10:06:31 +0200 |
| commit | 62900fe01b20b9bb19c3a91b1ca792e5dd1a9cd3 (patch) | |
| tree | c2e8cd93a3c5dd1a1d8dff77aca7580ea4c39841 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 6e6ae4cbf94e9ff8a4cccab3da2417aec3dfbc0c (diff) | |
| parent | 576b00a196cd3a2f786cc660d636f4732f530484 (diff) | |
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
addons/crm/crm_case_section_view.xml
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions