SBiOSoftWhare 17fb117329 Merge branch 'develop' into riot_2924 ... # Conflicts: # Riot/Modules/Room/DataSources/RoomDataSource.m		2020-01-31 16:45:35 +01:00
..
Assets	Settings > Security: Fix Giom's remarks	2020-01-30 13:19:09 +01:00
Categories	Room decoration: Use shields instead of padlocks	2020-01-31 14:59:54 +01:00
Coordinators	Revert "Add CoordinatorDelegateQueuable protocol used by view models to handle coordinator delegation in an operation queue."	2019-01-23 11:47:10 +01:00
Generated	Update pbxproj	2020-01-30 18:05:55 +01:00
Managers	Settings: LABS: Keep only one flag for cross-signing	2020-01-28 16:51:03 +01:00
Model	Join Room: Support via parameters to better handle federation	2019-07-08 11:15:44 +02:00
Modules	Merge branch 'develop' into riot_2924	2020-01-31 16:45:35 +01:00
Routers	Add modules property on NavigationRouterType.	2020-01-31 15:02:02 +01:00
SupportingFiles	User verification: Create UserEncryptionTrustLevel enum.	2020-01-30 17:42:54 +01:00
Utils	EventFormatter: Make key verification cancel and done event types visible in timeline.	2020-01-14 19:58:16 +01:00
AppDelegate.h	User verification: Update room member details screen with security section and shields.	2020-01-30 18:05:41 +01:00
AppDelegate.m	Merge branch 'develop' into riot_2924	2020-01-31 16:45:35 +01:00