diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-05-30 21:38:15 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-05-30 21:38:15 +0200 |
| commit | fa4ed55d54a11b8b2696b5223d849d3b6b0ffdfe (patch) | |
| tree | 91b0974e35a3cd108ba56683e18c66233c1d2ae7 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 227709dd21088c64cf6feaca4ff599e846040d00 (diff) | |
| parent | 84d194d7a18f3b9876e315bd77a0b176f74f8486 (diff) | |
Merge remote-tracking branch 'odoo/master' into master-odoo-cmd-fme
Conflicts:
openerpcommand/common.py
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions