Doug bf52311bda Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access ... # Conflicts: # Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift		2021-10-08 11:45:43 +01:00
..
Images.swift	Merge branch 'develop' into doug/4484_contacts_access	2021-09-30 11:14:02 +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	[Spaces] M10.6 Space preview bottom sheet #4497	2021-09-06 07:46:43 +03:00
Strings.swift	Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access	2021-10-08 11:45:43 +01:00