diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-01-12 16:28:13 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-01-12 16:28:13 +0100 |
| commit | 95925d22c350351edf6821e64fd4c484c76e74bc (patch) | |
| tree | 9baf7e97e5ffa65edff1018d82261d4b8f649482 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 74057523212179803f4253f9053cab355e45aafa (diff) | |
| parent | 3f8c2d0badcea3dd65c7fa9bdfabf0bc20da0355 (diff) | |
[MERGE] Merge parents
bzr revid: rim@openerp.com-20140109084852-87lg3kxta5k431ej
bzr revid: rim@openerp.com-20140110094655-jikmoy30iy0rinei
bzr revid: rim@openerp.com-20140112152813-cqoxl11ekblck2en
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions