mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
790604dad1
# Conflicts: # Riot/Assets/en.lproj/Vector.strings # Riot/Generated/Strings.swift # RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/ShareLocationActivityController.swift # RiotSwiftUI/Modules/Room/LocationSharing/MapViewErrorAlertInfoBuilder.swift |
||
---|---|---|
.. | ||
Images.swift | ||
RiotDefaults.swift | ||
Storyboards.swift | ||
Strings.swift | ||
UntranslatedStrings.swift |