diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-10-01 12:14:29 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fvdessen@gmail.com> | 2014-11-25 19:16:22 +0100 |
| commit | ee281659728ae8adb149e91cf6dd26011db6a71d (patch) | |
| tree | defa2f362e0b1b70ce31cbc2683432de5970a481 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | f2fdaa017c66bfcc6fceece37ba0931169dc89b8 (diff) | |
[MERGE] point_of_sale, pos_loyalty: merging the pos_loyalty module
Conflicts:
addons/point_of_sale/static/src/js/widgets.js
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions
