diff options
| author | Randhir Mayatra rma-openerp <rma@tinyerp.com> | 2014-04-14 14:06:31 +0530 |
|---|---|---|
| committer | Randhir Mayatra rma-openerp <rma@tinyerp.com> | 2014-04-14 14:06:31 +0530 |
| commit | e8f488065a67c5bfc6dcb44b208861c130cc93ff (patch) | |
| tree | c82af534634d460594997adc80b92a8d31391b17 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 53f71ba3d45c327badbae77cba68be26f02e06a2 (diff) | |
| parent | 8da0820a8800653a93229bd27e528ef073bef0d5 (diff) | |
[MERGE] merge with latest trunk and resolve conflicts
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions