summaryrefslogtreecommitdiff
path: root/addons/document/document_data.xml
diff options
context:
space:
mode:
authorSbh (Openerp) <sbh@tinyerp.com>2012-06-15 10:49:15 +0530
committerSbh (Openerp) <sbh@tinyerp.com>2012-06-15 10:49:15 +0530
commit9e84dba22c20e3a2fca1ee69f94db77030e1e54a (patch)
treeaf4cc72b85f1db24a870b85f32aa2d926691c9d7 /addons/document/document_data.xml
parent3c0086ac8cfadccc54119de4c53841d1d79d23a2 (diff)
parent4a42b0eb4e3ccce3f2c006684d157075dbd28c95 (diff)
[MERGE] Merge warning changes
bzr revid: sbh@tinyerp.com-20120615051915-35ne8oxoqxxa2i5i
Diffstat (limited to 'addons/document/document_data.xml')
0 files changed, 0 insertions, 0 deletions