Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing

# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
This commit is contained in:
Gil Eluard
2021-12-13 15:09:40 +01:00
52 changed files with 1746 additions and 241 deletions
+1 -1
View File
@@ -141,7 +141,7 @@
// Check whether the recents data source is correctly configured.
if (recentsDataSource.recentsDataSourceMode == RecentsDataSourceModePeople)
{
[self scrollToTheTopTheNextRoomWithMissedNotificationsInSection:recentsDataSource.conversationSection];
[self scrollToTheTopTheNextRoomWithMissedNotificationsInSection:recentsDataSource.peopleSection];
}
}