felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-25 11:02:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into mauroromito/fullscreen_mode_2

Browse Source 
# Conflicts:
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
This commit is contained in:
Mauro Romito
2022-11-10 14:29:08 +01:00
parent d4509b80f8 7440dff4a2
commit 49869ccd02
61 changed files with 1045 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+2 -2
View File
@@ -6769,8 +6769,8 @@ static CGSize kThreadListBarButtonItemImageSize;
[currentAlert dismissViewControllerAnimated:NO completion:nil];
UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertTitle]
message:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertMessage]
UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationAlertTitle]
message:[VectorL10n keyVerificationAlertBody]
preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertValidateAction]