Gil Eluard 8ba6c55a87 Merge branch 'develop' into spaces ... # Conflicts: # Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Home/Views/RoomCollectionViewCell.m # Riot/Modules/TabBar/TabBarCoordinator.swift		2021-09-15 14:42:04 +02:00
..
CellData	[Spaces] Show suggested in room lists #4501	2021-07-29 23:24:34 +02:00
DataSources	[Spaces] M10.6 Space preview bottom sheet #4497	2021-09-06 07:46:43 +03:00
Views	Merge branch 'develop' into spaces	2021-09-15 14:42:04 +02:00
RecentsViewController+RoomInvite.swift	The Invite cell behaviour is not driven by MXRoom.isDirect property anymore	2021-02-05 10:25:27 +01:00
RecentsViewController.h	Move data ready notification to RecentsViewController	2021-09-08 11:18:18 +03:00
RecentsViewController.m	Merge branch 'develop' into spaces	2021-09-15 14:42:04 +02:00
RecentsViewController.xib	Fix RecentsViewController after rebase again	2020-04-22 14:51:00 +03:00