Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2020-06-23 15:18:35 +01:00
commit 6161f95434
5 changed files with 196 additions and 14 deletions

View file

@ -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;