Doug 989f19696d Merge branch 'develop' into doug/fix_warnings ... # Conflicts: # Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift		2021-07-12 17:54:34 +01:00
..
AppAlertPresenter.swift	Add AlertPresentable that absracts an alert presenter.	2021-06-07 18:46:16 +02:00
AppCoordinator.swift	Fix SwiftLint warnings.	2021-07-02 17:13:45 +01:00
AppCoordinatorType.swift	Handle custom scheme URL	2020-12-18 18:44:08 +01:00
AppDelegate.swift	Integrate FLEX (#4394)	2021-06-09 09:58:22 +03:00
LegacyAppDelegate.h	Fix documentation warnings.	2021-07-02 16:46:27 +01:00
LegacyAppDelegate.m	Fix crash when running on macOS with Apple Silicon.	2021-07-05 19:19:51 +01:00