Gil Eluard afa77deef7 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing ... # Conflicts: # 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		2022-01-24 19:36:02 +01:00
..
InfoPlist.strings	vector-im/element-ios/issues/5298 - Improved error messages and moved map configuration to the BuildSettings	2022-01-04 17:33:32 +02:00
Localizable.strings	vector-im/element-ios/issues/5298 - Custom notification text for shared locations.	2022-01-04 17:33:32 +02:00
Vector.strings	Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing	2022-01-24 19:36:02 +01:00