Merge branch 'newtoolbar' into hpbs

2017-01-24 12:54:32 +01:00
parent f5753cf594 ce1e792419
commit 8ccd845d52
17 changed files with 85 additions and 120 deletions
--- a/server.js
+++ b/server.js
@@ -7,7 +7,6 @@ var Https = require('https');
 var Fs = require('fs');
 var WebSocketServer = require('ws').Server;
 var NetfluxSrv = require('./NetfluxWebsocketSrv');
-var WebRTCSrv = require('./WebRTCSrv');

 var config = require('./config');
 var websocketPort = config.websocketPort || config.httpPort;
@@ -103,5 +102,4 @@ if (websocketPort !== config.httpPort) {
 var wsSrv = new WebSocketServer(wsConfig);
 Storage.create(config, function (store) {
    NetfluxSrv.run(store, wsSrv, config);
-    WebRTCSrv.run(wsSrv);
 });