diff options
| author | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-01-16 20:23:07 +0530 |
|---|---|---|
| committer | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-01-16 20:23:07 +0530 |
| commit | 5d770d4b6f7adc2a8391eb03032cacf739f0c49e (patch) | |
| tree | 8fc61c56d6c0913d803b7eb6e4927e36e8b5d5dd /addons/analytic_user_function/security | |
| parent | fcf6109d163ad79ea48f0b442d3d411225369b9e (diff) | |
| parent | a1748260de4f4023616b0394fc98db90624d7920 (diff) | |
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al and resolve conflicts.
bzr revid: dka@tinyerp.com-20140116145307-u3e6gio449md3u2v
Diffstat (limited to 'addons/analytic_user_function/security')
0 files changed, 0 insertions, 0 deletions