diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2011-11-22 11:47:53 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2011-11-22 11:47:53 +0530 |
| commit | 67e7ba0d0037e82196d34c4a0e57244ea40f015e (patch) | |
| tree | af48ad5669afedcb28bd3ab9a862f3ec5a50e332 /addons/document/document_view.xml | |
| parent | d206d8dc42f4c364a407637d346e18d01ae4eaad (diff) | |
| parent | 1a2277c1407315546559eb8ed838018febcba9d5 (diff) | |
[MERGE]resove conflict and merge with main branch.
bzr revid: vme@tinyerp.com-20111122061753-5uxqy3mxw0eedthn
Diffstat (limited to 'addons/document/document_view.xml')
0 files changed, 0 insertions, 0 deletions