projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7393c91 b2bccf9)
[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:21:16 +0000 (15:51 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:21:16 +0000 (15:51 +0530)
bzr revid: fka@tinyerp.com-20120831102116-6ohk0uzvh8b57f2l

1  2 
addons/purchase/purchase_data.xml patch | diff1 | diff2 | blob | history

diff --cc addons/purchase/purchase_data.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.