diff options
| author | Josse Colpaert <jco@odoo.com> | 2014-07-13 09:27:20 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@odoo.com> | 2014-07-13 09:27:20 +0200 |
| commit | 32dd003d60f4e28626bdd44880d95e393f0dab50 (patch) | |
| tree | 7d99894a8ac2cc4b8e27efd0fafcc9ec0193ff4d /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | beb12f71f17cfb2dea0e52cf2e4c863da4bfcc86 (diff) | |
| parent | 5f5e18f9bbe8c2a69adc72cf54d099b4bf04f609 (diff) | |
[MERGE] Resolve conflicts 8.0
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions