diff options
| author | Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com> | 2013-06-21 23:56:58 -0400 |
|---|---|---|
| committer | Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com> | 2013-06-21 23:56:58 -0400 |
| commit | d30e1dd33079efdb71bd7abc88ea45ef33f77f05 (patch) | |
| tree | 1fad6788bd9caf9708c2cb91a6d4fb2fc92d1cec /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 66f63b3015c26c9863324e99e2a5334c24b03cfd (diff) | |
| parent | 591129f2eb7e56b3bc4dbc2f6e8a10a144bb3645 (diff) | |
[MERGE] Resync with lp:openobject-addons/7.0 to fix conflicts
bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622035658-fsiuszsmflgr08wh
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions