Merge branch 'spaces' into gil/4498_Handle_space_link

This commit is contained in:
Gil Eluard
2021-09-23 15:26:29 +02:00
46 changed files with 1850 additions and 1780 deletions
+1 -1
View File
@@ -2564,7 +2564,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
MXLogDebug(@"WARNING: The user has no device. Prompt for login again");
NSString *msg = NSLocalizedStringFromTable(@"e2e_enabling_on_app_update", @"Vector", nil);
NSString *msg = [VectorL10n e2eEnablingOnAppUpdate:AppInfo.current.displayName];
__weak typeof(self) weakSelf = self;
[_errorNotification dismissViewControllerAnimated:NO completion:nil];