summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function
diff options
context:
space:
mode:
authorParamjit Singh Sahota <psa@tinyerp.com>2013-08-26 15:05:29 +0530
committerParamjit Singh Sahota <psa@tinyerp.com>2013-08-26 15:05:29 +0530
commite6b47051ea6d0ebd17afbd50186d3670ea91beee (patch)
treef70e62a8e830c3ab92c5b8df35ab541a61fc1a53 /addons/analytic_user_function
parent011e195f3f293ee98cb2655d76cf5b7ff47cd7b5 (diff)
parentaf2306a29f9b3c7a52c9832f4f7f7f0faafd4954 (diff)
MERGED lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and resolved conflicts
bzr revid: psa@tinyerp.com-20130826093529-3o64l5r3osuxm6i4
Diffstat (limited to 'addons/analytic_user_function')
0 files changed, 0 insertions, 0 deletions