diff options
| author | Sanjay Gohel (OpenERP) <sgo@tinyerp.com> | 2013-10-29 19:03:47 +0530 |
|---|---|---|
| committer | Sanjay Gohel (OpenERP) <sgo@tinyerp.com> | 2013-10-29 19:03:47 +0530 |
| commit | eb1a56cd91b9f36bed54c458e88cdb51ac913d97 (patch) | |
| tree | ed9064b34f0ebd1b9ec23bb90b1af2a556245d25 /addons/project/project_data.xml | |
| parent | 328ec9ceacfca0fddc9e23cc201a31c746b40225 (diff) | |
| parent | 34564de66de6c3fa343a044d87e6a140f970a4f6 (diff) | |
[MERGE]merge and resolve conflicts
bzr revid: sgo@tinyerp.com-20131029133347-b22zkm0hgg3y9an3
Diffstat (limited to 'addons/project/project_data.xml')
0 files changed, 0 insertions, 0 deletions