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/SessionUIKit
Morgan Pretty e420ce4e58 Merge remote-tracking branch 'upstream/dev' into onboarding
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Onboarding/PNModeVC.swift
#	SessionUIKit/Style Guide/Values.swift
11 months ago
..
Components add some general localised strings 1 year ago
Database/Migrations Fixed a crash and config issue 12 months ago
Meta
Style Guide Merge remote-tracking branch 'upstream/dev' into onboarding 11 months ago
Types Fixed an accessibility regression 2 years ago
Utilities Merge branch 'dev' into onboarding 1 year ago
Configuration.swift Fixed an issue where the messages might not get reprocessed when they should 2 years ago