Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux

2016-03-11 17:15:55 +01:00 · 2016-03-11 17:15:55 +01:00 · 29033f344c
parent b1e8bcddef a9f088710c
commit 29033f344c
2 changed files with 4 additions and 1 deletions
--- a/.jshintignore
+++ b/.jshintignore
@ -11,3 +11,6 @@ www/code/rangy.js
 storage/kad.js
 www/common/otaml.js
 www/common/diffDOM.js
+www/common/netflux.js
+NetFluxWebsocketServer.js
+WebRTCSrv.js
--- a/www/input/main.js
+++ b/www/input/main.js
@ -33,7 +33,7 @@ define([
        websocketURL: Config.websocketURL,
        userName: Crypto.rand64(8),
        channel: key.channel,
-        key.cryptKey
+        cryptKey: key.cryptKey
    };

    var rttext = RTText.start(config);