Gil Eluard be4cd455f1 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
..
Modules	Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces	2022-01-13 16:30:55 +01:00
Common.xcconfig	vector-im/element-ios/issues/5298 - Various tweaks following code review.	2022-01-04 17:33:32 +02:00
Debug.xcconfig	vector-im/element-ios/issues/5114 - Poll creation screen	2021-11-11 11:24:28 +02:00
Info.plist	vector-im/element-ios/issues/5298 - Various tweaks following code review.	2022-01-04 17:33:32 +02:00
Release.xcconfig	vector-im/element-ios/issues/5114 - Poll creation screen	2021-11-11 11:24:28 +02:00
RiotSwiftUI-Bridging-Header.h	vector-im/element-ios/issues/5298 - Various tweaks following code review.	2022-01-04 17:33:32 +02:00
RiotSwiftUIApp.swift	vector-im/element-ios/issues/5114 - Poll creation screen	2021-11-11 11:24:28 +02:00
target.yml	vector-im/element-ios/issues/5298 - Various tweaks following code review.	2022-01-04 17:33:32 +02:00
targetUITests.yml	vector-im/element-ios/issues/5298 - Various tweaks following code review.	2022-01-04 17:33:32 +02:00
targetUnitTests.yml	UITests and Mock Screens	2021-09-09 16:23:00 +01:00