diff options
| author | Randhir Mayatra rma-openerp <rma@tinyerp.com> | 2014-04-14 14:17:14 +0530 |
|---|---|---|
| committer | Randhir Mayatra rma-openerp <rma@tinyerp.com> | 2014-04-14 14:17:14 +0530 |
| commit | 355a51a69d8d79beee501e1cbfabf0717b399fd2 (patch) | |
| tree | 41e2f462408935d9a618a8b2b1523c8128d530c3 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | e8f488065a67c5bfc6dcb44b208861c130cc93ff (diff) | |
| parent | 01d9ea6f64ba43f48d91c0b2bae28a095220f730 (diff) | |
[MERGE] merge with latest trunk and resolve remain confclits
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions