diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-22 16:29:42 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-22 16:29:42 +0200 |
| commit | 67366dfb5e31eba8bc883069eb59cc311d9e25c3 (patch) | |
| tree | d5eca575ce087c5cb57401fc2b5b4521522a9590 /addons/analytic_user_function/i18n/analytic_user_function.pot | |
| parent | 2cf91d16a5f844a2a3d5d22c025c180a6615bab8 (diff) | |
| parent | 8ac40acb0d9a234eb59e55c3bc8f1a9a75bc4469 (diff) | |
[MERGE] merge upstream branch.
Forward ports generates a lot of conflicts to resolve. Rebasing
(even with rerere) will force me to re-resolve most of the conflicts.
Diffstat (limited to 'addons/analytic_user_function/i18n/analytic_user_function.pot')
0 files changed, 0 insertions, 0 deletions