Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy

This commit is contained in:
David Baker 2020-03-26 11:14:33 +00:00
commit 8a64caa925

View file

@ -20,7 +20,6 @@ import Modal from '../../../Modal';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import * as sdk from "../../../index";
import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
import DeviceListener from '../../../DeviceListener';
import SetupEncryptionDialog from "../dialogs/SetupEncryptionDialog";
import { accessSecretStorage } from '../../../CrossSigningManager';