Gil Eluard 2a09ca3947 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing ...

# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift

2021-12-13 15:09:40 +01:00

..

DataSources

Invite to Space in room landing #5225

2021-12-09 16:12:44 +01:00

Model

Update all Objective-C MatrixKit imports to handle new location.

2021-11-30 16:09:53 +01:00

Service

Fix hidden rooms from showing.

2021-11-24 11:38:32 +00:00

Views

Update all Objective-C MatrixKit imports to handle new location.

2021-11-30 16:09:53 +01:00

RecentsViewController.h

Update all Objective-C MatrixKit imports to handle new location.

2021-11-30 16:09:53 +01:00

RecentsViewController.m

vector-im/element-ios/issues/5190 - Fix crash when trying to scroll the people's tab to the top.

2021-12-09 09:39:40 +02:00

RecentsViewController.xib

Fix RecentsViewController after rebase again

2020-04-22 14:51:00 +03:00

RecentsViewController+RoomInvite.swift

Change method parameter

2021-09-22 11:43:07 +03:00