Gil Eluard 996ef72498 Merge branch 'develop' into gil/SP1_space_creation ... # Conflicts: # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.h # Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift		2022-03-08 11:23:55 +01:00
..
Modules	Merge branch 'develop' into gil/SP1_space_creation	2022-03-08 11:23: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	Fix ThemeService not available on the RiotSwiftUI target.	2022-02-03 18:30:39 +00:00
RiotSwiftUIApp.swift	vector-im/element-ios/issues/5114 - Poll creation screen	2021-11-11 11:24:28 +02:00
target.yml	Instrument missing screen metrics (#5764)	2022-03-08 10:13:46 +01:00
targetUITests.yml	Instrument missing screen metrics (#5764)	2022-03-08 10:13:46 +01:00
targetUnitTests.yml	Instrument missing screen metrics (#5764)	2022-03-08 10:13:46 +01:00