diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-01-16 10:17:16 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-01-16 10:17:16 +0100 |
| commit | ab5c23079ab6e0c3d773f6c5364333e851481cfb (patch) | |
| tree | 35642567a517c0638f9b954bae4f58ffe27f19d1 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 130fff6241300cfcaf7a233905b63e2894e1cae0 (diff) | |
| parent | 7b2948c3bcf9da7de528c6ef76e54d8821133450 (diff) | |
[MERGE] Sync with trunk, solved conflicts.
bzr revid: tde@openerp.com-20140116091716-zk1n5ots94i65io5
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions