Merge branch 'staging' into newDrive

This commit is contained in:
yflory 2017-06-09 14:47:37 +02:00
commit fd88162624

View File

@ -303,7 +303,7 @@ define([
if (path[0] === 'drive' && path[1] === "migrate" && value == 1) { if (path[0] === 'drive' && path[1] === "migrate" && value == 1) {
rt.network.disconnect(); rt.network.disconnect();
rt.realtime.abort(); rt.realtime.abort();
Cryptpad.alert(Cryptpad.Messages.fs_migration); Cryptpad.alert(Cryptpad.Messages.fs_migration, null, true);
} }
}); });
}; };