colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
Bringing our development (beta) branch inline with all the more urgent
fixes which went directly into the master (production) branch.
This commit is contained in:
Scott Nonnenberg
2017-11-08 17:02:00 -08:00
parent 30c5b62687 0a2651c0a7
commit 9e6d50b966
22 changed files with 1543 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libtextsecure/api.js
View File

@@ -37,7 +37,7 @@ var TextSecureServer = (function() {
url = options.host + '/' + options.path;
}
console.log(options.type, url);
var timeout = typeof options.timeout !== 'undefined' ? options.timeout : 5000;
var timeout = typeof options.timeout !== 'undefined' ? options.timeout : 10000;
var fetchOptions = {
method: options.type,