summaryrefslogtreecommitdiff
path: root/doc/reference/javascript_reference.rst
diff options
context:
space:
mode:
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>2013-04-09 11:15:16 +0530
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>2013-04-09 11:15:16 +0530
commit87c67a33bc60ee12816b51bf56d6254b5c3f2a50 (patch)
tree26afce322f4375503cb6afbe0c32155ca69260d1 /doc/reference/javascript_reference.rst
parent3b9795f7386fdbfcace0d5a91dd53dd3e2373c62 (diff)
[REMOVE] conflict
bzr revid: fka@tinyerp.com-20130409054516-8wh9d8jybh918i0p
Diffstat (limited to 'doc/reference/javascript_reference.rst')
0 files changed, 0 insertions, 0 deletions