diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-05-30 10:29:30 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-05-30 10:29:30 +0200 |
| commit | 514203743d3f8fbdaf2f976972aa0a20e202cc07 (patch) | |
| tree | eade58a00234937bdffd0ad717153fb962f70490 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 1a7101d94edb533eb319ae8a0ed600f84ce5b987 (diff) | |
| parent | fb650ee92eb2e8885737a63bc8db702c964926ae (diff) | |
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
addons/mrp/mrp_view.xml
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions