diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-01-16 11:39:10 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-01-16 11:39:10 +0100 |
| commit | 9cf78e93ccb6051731355e4ba5931a532b1f7f28 (patch) | |
| tree | 5ac937214c7646edc6c5a4f5ecad40a9f8463dbc /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 8bfed064590a19a7a78939ec6f0865715a33f13b (diff) | |
| parent | 58907da3ee30be831083f6dcc804c31e7b73df5a (diff) | |
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions