summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function_view.xml
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2014-01-28 19:57:36 +0100
committerOlivier Dony <odo@openerp.com>2014-01-28 19:57:36 +0100
commit52b811b7f9f4201cea8103413b3ce94c4d41156e (patch)
treedad8e3724cf01e99fb9118779b3ce308bc6ba628 /addons/analytic_user_function/analytic_user_function_view.xml
parente54cb0291a5f342ca8ee24f4d93ee860b165fb1c (diff)
[FIX] Incomplete merge during previous trunk sync
bzr revid: odo@openerp.com-20140128185736-p5s5oujsju1mj88k
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions