web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yann Flory
2016-03-11 17:15:55 +01:00
parent b1e8bcddef a9f088710c
commit 29033f344c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.jshintignore
View File

@@ -11,3 +11,6 @@ www/code/rangy.js
storage/kad.js storage/kad.js
www/common/otaml.js www/common/otaml.js
www/common/diffDOM.js www/common/diffDOM.js
www/common/netflux.js
NetFluxWebsocketServer.js
WebRTCSrv.js

2
www/input/main.js
View File

@@ -33,7 +33,7 @@ define([
websocketURL: Config.websocketURL, websocketURL: Config.websocketURL,
userName: Crypto.rand64(8), userName: Crypto.rand64(8),
channel: key.channel, channel: key.channel,
key.cryptKey cryptKey: key.cryptKey
}; };
var rttext = RTText.start(config); var rttext = RTText.start(config);