Fix merge error

2016-10-06 22:48:30 +02:00
parent 83c3f6310a 5300bc363c
commit f8ac3a6ad3
21 changed files with 497 additions and 450 deletions
--- a/server.js
+++ b/server.js
@@ -83,10 +83,9 @@ app.get('/api/config', function(req, res){
    var host = req.headers.host.replace(/\:[0-9]+/, '');
    res.setHeader('Content-Type', 'text/javascript');
    res.send('define(' + JSON.stringify({
+        websocketPath: config.websocketPath,
        websocketURL:'ws' + ((httpsOpts) ? 's' : '') + '://' + host + ':' +
            websocketPort + '/cryptpad_websocket',
-        webrtcURL:'ws' + ((httpsOpts) ? 's' : '') + '://' + host + ':' +
-            websocketPort + '/cryptpad_webrtc',
    }) + ');');
 });