Merge branch 'master' into develop

2020-06-23 15:18:35 +01:00
parent d61d243284 5256a86545
commit 6161f95434
5 changed files with 196 additions and 14 deletions
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -36,7 +36,7 @@ export class SetupEncryptionStore extends EventEmitter {
            return;
        }
        this._started = true;
-        this.phase = PHASE_BUSY;
+        this.phase = PHASE_INTRO;
        this.verificationRequest = null;
        this.backupInfo = null;