diff options
| author | Josse Colpaert <jco@odoo.com> | 2014-06-25 15:10:18 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@odoo.com> | 2014-06-25 15:10:18 +0200 |
| commit | 8678d3c8904df081a8f614d291c81b177f1d1c71 (patch) | |
| tree | 534585d72ea9391097328f73347ec4385d2c518c /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 12211437f1f7a11edde36b76ea809f69fa7fc207 (diff) | |
| parent | 343cc85808b212cd6ac44fb71a03d7525124786e (diff) | |
[MERGE] Merge from master routing conflict
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions