diff options
| author | Randhir Mayatra rma-openerp <rma@tinyerp.com> | 2014-04-14 16:31:49 +0530 |
|---|---|---|
| committer | Randhir Mayatra rma-openerp <rma@tinyerp.com> | 2014-04-14 16:31:49 +0530 |
| commit | c399e1daaf386fbc6672a77508e153e5a85d47a7 (patch) | |
| tree | 6a97011416d113d7dbe8f63438843477c5348770 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 85714eabb6b650bc2cda256bbcef0b33db96abf6 (diff) | |
| parent | 6d99b1df5286dab08964042520aea8f3fcfede36 (diff) | |
[MERGE] merge with latest trunk and resolve conflicts
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions