mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 02:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' into fix-timeslider

Browse source
This commit is contained in:
Marcel Klehr 2014-01-24 17:29:10 +01:00
commit 59f54ad3ae
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/static/js/pad_impexp.js
View file

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