summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function_view.xml
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2014-05-14 15:02:47 +0200
committerXavier Morel <xmo@openerp.com>2014-05-14 15:02:47 +0200
commit9ac3a4925759181abf9f0a792c57d275a03f086f (patch)
tree0bbe2216d0087ab60081267271fb087d375c27c1 /addons/analytic_user_function/analytic_user_function_view.xml
parent3ca44e9324bad0b2577e0946e1ecaa4a105a816a (diff)
parent08c504d39e5670b8d1054fc0c0f1b5831fbfc9bc (diff)
parent240e91184b710b36b204448d4eaa5cea2cfbbb31 (diff)
Merge branches 'server-saas-4', 'web-saas-4' and 'addons-saas-4' into saas-4