diff options
| author | Hardik Ansodariy (OpenERP) <han@tinyerp.com> | 2011-08-29 11:51:49 +0530 |
|---|---|---|
| committer | Hardik Ansodariy (OpenERP) <han@tinyerp.com> | 2011-08-29 11:51:49 +0530 |
| commit | f181077421646a17abef246295d7f7e538b75bcd (patch) | |
| tree | 00e07d713cdc7698346ae85e1ed35aa2de21568e /addons/plugin/plugin_handler.py | |
| parent | 875ecfcad9f380843441b02868153c20a670f3b5 (diff) | |
| parent | 65c43a1946a871a99642721b7a559f56df103d07 (diff) | |
[IMP] confliction resoved
bzr revid: han@tinyerp.com-20110829062149-tfhlws3kv50wvmn9
Diffstat (limited to 'addons/plugin/plugin_handler.py')
0 files changed, 0 insertions, 0 deletions