Files
bundesmessenger-ios/RiotSwiftUI/Modules/Room/LocationSharing
SBiOSoftWhare 1bb0ef6f27 Merge branch 'develop' into steve/5723_lls_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/ShareLocationActivityController.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/MapViewErrorAlertInfoBuilder.swift
2022-04-22 12:15:34 +02:00
..