diff options
| author | Ujjvala Collins (OpenERP) <uco@tinyerp.com> | 2011-12-12 12:44:29 +0530 |
|---|---|---|
| committer | Ujjvala Collins (OpenERP) <uco@tinyerp.com> | 2011-12-12 12:44:29 +0530 |
| commit | c922cd895f81ee396be35424ebe247db2f2e025d (patch) | |
| tree | 512c648df8b084ee4bb8bc89851d558f4777d15a /addons/web_process/static | |
| parent | 5030f3e6d17125b35e6be7928930fb0f0bc0ed42 (diff) | |
[FIX] marketing_campaign: Resolved conflicts.
bzr revid: uco@tinyerp.com-20111212071429-42kl7qrteufbkyna
Diffstat (limited to 'addons/web_process/static')
0 files changed, 0 insertions, 0 deletions