Merge branch 'master' into docker

This commit is contained in:
adolfintel 2019-01-31 12:43:50 +01:00
commit 836e6cdaf1

View file

@ -664,7 +664,7 @@ function sendTelemetry(done) {
};
xhr.onerror = function() {
console.log("TELEMETRY ERROR " + xhr.status);
done(-1);
done(null);
};
xhr.open("POST", settings.url_telemetry + url_sep(settings.url_telemetry) + "r=" + Math.random(), true);
var telemetryIspInfo = {