summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function.py
diff options
context:
space:
mode:
authorDenis Ledoux <dle@odoo.com>2014-08-11 16:03:41 +0200
committerDenis Ledoux <dle@odoo.com>2014-08-11 16:03:41 +0200
commit233670d681a2fd045abd7a110e7097315a9aa5b2 (patch)
treea7617fb0f59c4131c9eed6896caf77df9ad39ccb /addons/analytic_user_function/analytic_user_function.py
parentae65be2b2ae98860f70a7e6f3d7679c40ea9bd93 (diff)
[FIX] ir_cron: forgotten conflict from forward port ae65be2b2ae98860f70a7e6f3d7679c40ea9bd93
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
0 files changed, 0 insertions, 0 deletions