diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-05-28 14:31:46 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-05-28 14:31:46 +0200 |
| commit | 1f22653d195d2aec1b8b296e3436b1747640dfa4 (patch) | |
| tree | 45c9f1ceb42b8f7ccb1e51186d6cf5bdf02b6035 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 92583db004a10b246f1a648a208a296930b084e1 (diff) | |
| parent | fe2b5f35a40ca8df662130608b0f89427a196362 (diff) | |
[MERGE] saas-6 forward-port
Rebasing a merge commit with a lot of conflicts is a real pain as every
non-automatic conflicts should be redo manually (especially when there
is a lot of file rename that git cannot follow)
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
0 files changed, 0 insertions, 0 deletions