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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
This commit is contained in:
Doug
2021-11-17 17:36:44 +00:00
parent 732f18525a 7436ca026c
commit 6dd471045f
27 changed files with 475 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Application/AppCoordinator.swift
+1 -1
View File
@@ -228,7 +228,7 @@ extension AppCoordinator: LegacyAppDelegateDelegate {
}
func legacyAppDelegateRestoreEmptyDetailsViewController(_ legacyAppDelegate: LegacyAppDelegate!) {
self.splitViewCoordinator?.restorePlaceholderDetails()
self.splitViewCoordinator?.resetDetails(animated: false)
}
func legacyAppDelegate(_ legacyAppDelegate: LegacyAppDelegate!, didAddMatrixSession session: MXSession!) {