element-ios/Riot/Assets/en.lproj
Aleksandrs Proskurins 3deee90005 Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/Unit/UserSessionOverviewViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
2022-10-04 15:14:59 +03:00
..
InfoPlist.strings Update camera, contacts and photos usage strings for App Store review. 2022-08-11 16:40:22 +01:00
Localizable.strings Rename NOTIFICATION key to Notification for missing translations. 2022-04-08 14:14:34 +01:00
Untranslated.strings Move FTUE strings for translation. 2022-07-14 16:56:35 +01:00
Vector.strings Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen 2022-10-04 15:14:59 +03:00