Commit Graph

2 Commits

Author SHA1 Message Date
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
MaximeE c49d6d755d 5982: Factorise error and external sharing 2022-04-08 17:43:57 +02:00