Gil Eluard f7ac4ee17d Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces ...

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift

2022-01-13 16:30:55 +01:00

..

DataSources

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

2022-01-13 16:30:55 +01:00

Model

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

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

Service

Fix initial sync crash

2022-01-07 16:06:54 +03:00

Views

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

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

RecentsViewController.h

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

2021-12-27 11:48:36 +01:00

RecentsViewController.m

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

2022-01-13 16:30:55 +01: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