Gil Eluard f7cb26b1ff Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces ... # Conflicts: # Riot/Generated/Strings.swift # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/SupportingFiles/Riot-Bridging-Header.h # RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift		2021-12-27 11:59:10 +01:00
..
Images.swift	Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces	2021-12-27 11:48:36 +01:00
MatrixKitStrings.swift	Update MatrixKitStrings.	2021-12-07 16:44:54 +01:00
RiotDefaults.swift	Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class.	2021-09-22 16:59:47 +03:00
Storyboards.swift	Invite to Space in room landing #5225	2021-12-13 22:16:02 +01:00
Strings.swift	Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces	2021-12-27 11:59:10 +01:00