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

Merge commit '35b2fdc538dfc1f8fac2585704526ab26148a9ab' into feature/3977_merge_element_1_9_13

Browse Source 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.xib
#	Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
#	Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/TabBar/MasterTabBarController.m
#	fastlane/Fastfile
This commit is contained in:
Frank Rotermund
2022-12-19 14:36:30 +01:00
parent d85f25d449 35b2fdc538
commit 67dd4f918e
245 changed files with 5346 additions and 1952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/Security/SecurityViewController.m
+2 -2
View File
@@ -1234,9 +1234,9 @@ TableViewSectionsDelegate>
cell = [secureBackupSection cellForRowAtRow:rowTag];
}
#ifdef CROSS_SIGNING_AND_BACKUP_DEV
else if (section == SECTION_KEYBACKUP)
else if (sectionTag == SECTION_KEYBACKUP)
{
cell = [keyBackupSection cellForRowAtRow:row];
cell = [keyBackupSection cellForRowAtRow:rowTag];
}
#endif
else if (sectionTag == SECTION_CROSSSIGNING)