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/Meta
Morgan Pretty 65057fba21 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserProfile.swift
#	SessionMessagingKit/SessionUtil/Database/QueryInterfaceRequest+Utilities.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionUtilitiesKit/Database/Storage.swift
#	SessionUtilitiesKit/Utilities/Bencode.swift
#	SignalUtilitiesKit/Utilities/AppSetup.swift
2 years ago
..
AudioFiles add silence audio file 3 years ago
Certificates Updated the certificate for seed3 2 years ago
Countries Improve onion request path loading efficiency 4 years ago
Fonts Fix missing font 4 years ago
Images.xcassets Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 2 years ago
Mnemonic Debug 5 years ago
Settings.bundle Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support 2 years ago
Translations Merge branch 'feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago
TurnServers add session turn server info 3 years ago
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
AppEnvironment.swift Fixed a few more PN logic issues 2 years ago
Launch Screen.storyboard Updated the app settings screens 3 years ago
MainAppContext.swift Fixed a number of issues with the Notification Service Extension 2 years ago
Session-Info.plist clean 2 years ago
SessionApp.swift [WIP] Refactored dependency access to be more generic 2 years ago
Signal-Bridging-Header.h Merge branch 'dev' into disappearing-message-redesign 2 years ago
Signal.entitlements Removed the iCloud entitlements 2 years ago
SignalTSan.supp Organize files 5 years ago
SignalUBSan.supp Organize files 5 years ago