diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-11-15 14:29:23 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-11-15 14:29:23 +0100 |
| commit | c1257b5483ede433e05b0101f05720ab9639d1b9 (patch) | |
| tree | e40f509559559dd005638eb797a71a4091476305 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 6e3dd819ea24bc6cdbaf0180a366547a684f0cda (diff) | |
[MERGE] Coming from failed merge
bzr revid: tde@openerp.com-20131115132923-3nqsfqah4dfc3lyx
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions