diff options
| author | ajay javiya (OpenERP) <aja@tinyerp.com> | 2014-04-01 10:58:01 +0530 |
|---|---|---|
| committer | ajay javiya (OpenERP) <aja@tinyerp.com> | 2014-04-01 10:58:01 +0530 |
| commit | 138f5d7f32e9480539bed126cfaf55748797c82a (patch) | |
| tree | 6cdfbddb931cef024a8efced5415e717769ce666 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 88236bf2acb689454ae893d84737086f55439150 (diff) | |
| parent | ee9191ca1b08c87c3b72698fffea0f3b753776e2 (diff) | |
[MERGE] : with trunk and resolve conflicts
bzr revid: aja@tinyerp.com-20140401052801-4483i0z0ivmrwsbn
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions