diff options
| author | ajay javiya (OpenERP) <aja@tinyerp.com> | 2014-04-01 18:55:34 +0530 |
|---|---|---|
| committer | ajay javiya (OpenERP) <aja@tinyerp.com> | 2014-04-01 18:55:34 +0530 |
| commit | 7126bc5b500db52440f40cfe2ed7c1395ac3fcde (patch) | |
| tree | 7c939b5e42be9be5a62355f9f90799b3dc82bfdd /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | eff3ce022ceaf2264220a1d4ec1990a482095d8a (diff) | |
| parent | cf139faeff60dd8191258ba7ff894a79a543faf0 (diff) | |
[MERGE] : with trunk and resolve conflicts
bzr revid: aja@tinyerp.com-20140401132534-owbxvwqo6qpodw7e
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions