mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 01:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fixed merge conflicts

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-15 16:58:22 +01:00
commit 255dc5a325
7 changed files with 71 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
node/server.js
View file

@ -215,6 +215,7 @@ async.waterfall([
return;
}
res.header("Access-Control-Allow-Origin", "*");
res.header("Server", serverName);
exportHandler.doExport(req, res, req.params.pad, req.params.type);
});