You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/Session/Onboarding
Morgan Pretty ecd066f7a1 Merge remote-tracking branch 'upstream/dev' into strings
# Conflicts:
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Messages/Control Messages/CallMessage.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ThreadPickerVC.swift
7 months ago
..
DisplayNameScreen.swift Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
LandingScreen.swift fix some strings 7 months ago
LoadAccountScreen.swift plurals and fix some strings 8 months ago
LoadingScreen.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
Onboarding.swift Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 8 months ago
PNModeScreen.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
PNOptionView.swift WIP: Replace strings 1 year ago
SeedReminderView.swift Merge branch 'onboarding' into standardised-strings 11 months ago