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

Fixed merge conflicts

Browse Source
This commit is contained in:
Arnfried Griesert
2023-03-20 07:33:28 +01:00
parent e5d97ed154
commit c61ddcf39a
8 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewController.swift
+1 -1
View File
@@ -142,7 +142,7 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
self.closeButtonContainer.isHidden = self.navigationController != nil
self.title = BWIL10n.keyVerificationVerifyQrCodeTitle // $$$ 1.10.5 does not have this line
self.title = BWIL10n.keyVerificationVerifyQrCodeTitle
self.titleLabel.text = BWIL10n.keyVerificationVerifyQrCodeTitle
self.informationLabel.text = VectorL10n.keyVerificationVerifyQrCodeInformation