diff options
| author | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-02-21 10:27:44 +0530 |
|---|---|---|
| committer | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-02-21 10:27:44 +0530 |
| commit | b69271064b591b5211845501a36b7f705e556846 (patch) | |
| tree | 1a4f56b1a830506ff15778f0eb6e866037ff1941 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 1e16c40ab00f21f49a12b6c43b08df864d400b90 (diff) | |
| parent | 4769ff5e5de8cfe530ffac9e4c4c9e170f31f2e7 (diff) | |
[MERGE]sync with trunk and resolve conflicts.
bzr revid: dka@tinyerp.com-20140221045744-hopnxp3mj9z7vz0j
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions