summaryrefslogtreecommitdiff
path: root/addons/web_etherpad/static/src/xml/etherpad.xml
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-04-25 12:30:42 +0200
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-04-25 12:30:42 +0200
commitfca52c458aeb29eb0ef2b18df69d3f52ca90fe21 (patch)
tree31faf555383d7a2267d67ea6ea39f1cdb2fe5e59 /addons/web_etherpad/static/src/xml/etherpad.xml
parent74b003f101ee9c36e02fd905fd4e1d9e4803888a (diff)
parente9f015e217f1ff48d95e9b55a9515b7276240c48 (diff)
[MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20120425103042-sih66nc0vd1s0ftd
Diffstat (limited to 'addons/web_etherpad/static/src/xml/etherpad.xml')
0 files changed, 0 insertions, 0 deletions