diff options
| author | Yannick Vaucher <yannick.vaucher@camptocamp.com> | 2014-04-28 16:20:17 +0200 |
|---|---|---|
| committer | Yannick Vaucher <yannick.vaucher@camptocamp.com> | 2014-04-28 16:20:17 +0200 |
| commit | 22d1c0956ffab1ef190cd67daed75cf8ff12963c (patch) | |
| tree | 4d82933e6a6b10a1c4e7efcc97a18b75c876e162 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 886c82745873f77eef21a8158fb601086f168891 (diff) | |
| parent | a2536d5e3271160d9d67d49268b0d4f7960588bf (diff) | |
[UPD] resolve conflicts with main branch and fix bug introduced in rev 10015 lp:1313622
lp bug: https://launchpad.net/bugs/1313622 fixed
bzr revid: yannick.vaucher@camptocamp.com-20140428142017-3warx1ai72cfetj1
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions