SBiOSoftWhare 790604dad1 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
..
LocationSharingMapView.swift	Merge branch 'develop' into steve/5723_lls_screen	2022-04-22 12:15:34 +02:00
LocationSharingMarkerView.swift	Fix LocationAnnotatonView not touchable.	2022-04-05 21:32:40 +02:00
LocationSharingOptionButton.swift	5720: Remove useless color, fix some issue with AvatarImage border	2022-03-24 11:00:29 +01:00
LocationSharingView.swift	Merge branch 'develop' into maximee/5982_ls_static_share_viewer	2022-04-11 17:26:07 +02:00
MapCreditsView.swift	Create reusable MapCreditsView.	2022-03-16 11:04:58 +01:00
UserAnnotationCalloutContentView.swift	Create map callout view UserAnnotationCalloutContentView.	2022-04-05 17:30:17 +02:00
UserAnnotationCalloutContentView.xib	UserAnnotationCalloutContentView: Update layout.	2022-04-06 10:19:43 +02:00
UserAnnotationCalloutView.swift	Update UserAnnotationCalloutView center.	2022-04-05 21:33:05 +02:00
UserLocationAnnotationView.swift	Merge branch 'develop' into steve/5723_lls_screen	2022-04-22 12:15:34 +02:00