diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-02-25 11:31:55 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-02-25 11:31:55 +0100 |
| commit | 02b70e2950c275e3bda3c172fdd72affa26d14b6 (patch) | |
| tree | 879b87edb0c1c85398e10650da0da06d2a494336 /addons/analytic_user_function/security | |
| parent | 893b7041f97a5f98dbb95affdfeecbcdb6db69ed (diff) | |
[FIX] fixes problems due to the preceding merge (resolved conflict was not properly resolved) (addon web_graph)
bzr revid: ged@openerp.com-20140225103155-9cdbs8p79sa7hkwi
Diffstat (limited to 'addons/analytic_user_function/security')
0 files changed, 0 insertions, 0 deletions