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
..
MasterTabBarController.h	Fix documentation warnings.	2021-07-02 16:46:27 +01:00
MasterTabBarController.m	MasterTabBarController: Add sanity checks when add or remove a session. Fix runtime issue with Xcode 12.5 and NSArray mismatch type with Swift (see https://forums.swift.org/t/objective-c-interoperability-type-mismatch/12464 for more information).	2021-06-07 16:20:49 +02:00
TabBarCoordinator.swift	it's easy for the back button to trigger a leftpanel reveal (#4438)	2021-07-09 23:54:25 +02:00
TabBarCoordinatorType.swift	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00