Gil Eluard 4c4f668e57 Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces ... # Conflicts: # Riot/Assets/en.lproj/Vector.strings # Riot/Generated/Strings.swift # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift # Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift # Riot/SupportingFiles/Riot-Bridging-Header.h # RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift		2022-01-17 20:40:12 +01:00
..
Views	Update all Objective-C MatrixKit imports to handle new location.	2021-11-30 16:09:53 +01:00
InviteFriendsPresenter.swift	vector-im/element-ios/issues/5298 - Various tweaks following code review.	2022-01-04 17:33:32 +02:00
PeopleViewController.h	Remove old conformances.	2021-07-27 14:53:58 +01:00
PeopleViewController.m	Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces	2022-01-17 20:40:12 +01:00