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

pull/1/head
ansuz 8 years ago
commit 0bb10a8a0a

@ -5,6 +5,7 @@ www/common/chainpad.js
storage/kad.js
www/common/otaml.js
server.js
NetFluxWebsocketSrv.js
NetFluxWebsocketServer.js
WebRTCSrv.js

@ -272,7 +272,7 @@ define([
var unsorted = files[rootName].slice();
var ret = [];
var i = -1;
while ((i = unsorted.indexOf(href, i+1)) != -1){
while ((i = unsorted.indexOf(href, i+1)) !== -1){
ret.push([rootName, i]);
}
return ret;

Loading…
Cancel
Save