mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 15:52:40 +00:00
455118d22b
# Conflicts: # RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift # RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift # RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift # RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift # RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift |
||
---|---|---|
.. | ||
InfoPlist.strings | ||
Localizable.strings | ||
Untranslated.strings | ||
Vector.strings |