summaryrefslogtreecommitdiff
path: root/addons/web_etherpad/static/src/xml
diff options
context:
space:
mode:
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>2012-04-19 15:28:19 +0530
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>2012-04-19 15:28:19 +0530
commit6589bfeb81c1346af3383688c404fd2c245cb3ac (patch)
tree7c9fa004eedd8af94c4232923a44bbb1e0303e91 /addons/web_etherpad/static/src/xml
parent217cf2e14bdb78f77138872b8f9ea0ba0baff050 (diff)
parentac8646d3223bfa052cbb81d94fe1076f58b50f8c (diff)
[MRG] merge with main branch.
bzr revid: tpa@tinyerp.com-20120419095819-o07ywcs2qnx6s4tm
Diffstat (limited to 'addons/web_etherpad/static/src/xml')
0 files changed, 0 insertions, 0 deletions