Merge branch 'develop' into fix-timeslider

fix-timeslider
Marcel Klehr 2014-01-24 17:29:10 +01:00
commit 59f54ad3ae
1 changed files with 1 additions and 0 deletions

View File

@ -77,6 +77,7 @@ var padimpexp = (function()
} }
currentImportTimer = null; currentImportTimer = null;
importFailed("Request timed out."); importFailed("Request timed out.");
importDone();
}, 25000); // time out after some number of seconds }, 25000); // time out after some number of seconds
$('#importsubmitinput').attr( $('#importsubmitinput').attr(
{ {